ACL: Permit the "encrypted" condition to be used in a HELO/EHLO ACL

[exim.git] / test / README

diff --git a/test/README b/test/README
index 34f09ff08339b093e9d53a5d8763dc6c97313034..ab9fb64966bba9a50757dd9d56d15f680de96a06 100644 (file)
--- a/test/README
+++ b/test/README
@@ -747,6 +747,12 @@ This command runs the exigrep utility with the given data (the search pattern)
 on the current mainlog file.
 
 
 on the current mainlog file.
 
 

+  exiqgrep <data>
+
+This command runs the exiqgrep utility with the given options
+on the current spool directory.
+
+

   gnutls
 
 This command is present at the start of all but one of the tests that use
   gnutls
 
 This command is present at the start of all but one of the tests that use


@@ -859,14 +865,24 @@ Commands with input
 -------------------
 
 The remaining commands are followed by data lines for their standard input,
 -------------------
 
 The remaining commands are followed by data lines for their standard input,

-terminated by four asterisks. Even if no data is required for the particular
+terminated by four asterisks ("****"). Even if no data is required for the particular

 usage, the asterisks must be given.
 
 usage, the asterisks must be given.
 

-If the input line starts with '>>> ', this prefix and any trailing spaces
-(including line feed) are removed. The reminder is processed with Perl's string
-eval() function, effectivly evaluatiing escape sequences like '\x41', '\r', and
-such.  If you need a line feed there, you need to encode it according to your
-needs.
+If the input line starts with ':<cmd>:', this prefix is removed and the
+line is processed by the runtest script before sending. The following
+commands are recognised:
+
+- "eval": process the reset of the line with Perl's string eval()
+  function. This can be used to send arbitrary data by encoding it as
+  escape sequences (e.g. "\x41\101"). If you need a line ending, you have
+  to append it accordingly (e.g. "\r\n").
+
+- "noeol": do not terminate the data sent to the application with an end
+  of line character.
+
+- "sleep": interpret the rest of the line as an integer and sleep for
+  that number of seconds before proceeding. No data will be output to
+  the application.

 
 
   background
 
 
   background


@@ -1034,28 +1050,28 @@ CLIENT SCRIPTS
 
 Lines in client scripts are of several kinds:
 
 
 Lines in client scripts are of several kinds:
 

-(1) If a line begins with three question marks and a space, the rest of the
+(1) "??? ": If a line begins with three question marks and a space, the rest of the

     line defines the start of expected output from the server. If what is
     received does not match, the client bombs out with an error message.
 
     line defines the start of expected output from the server. If what is
     received does not match, the client bombs out with an error message.
 

-(2) If a line begins with three question marks and an asterisk, the server
+(2) "???*": If a line begins with three question marks and an asterisk, the server

     is expected to close the connection.
 
     is expected to close the connection.
 

-(3) If a line begins with four question marks, the rest of the line defines
+(3) "????": If a line begins with four question marks, the rest of the line defines

     the start of one or more possible output lines from the server.  When it
     matches, the client silently repeats the comparison using the next server
     line.  When the match fails, the client silently proceeds to the next script
     line with the then-current server output unconsumed.
 
     the start of one or more possible output lines from the server.  When it
     matches, the client silently repeats the comparison using the next server
     line.  When the match fails, the client silently proceeds to the next script
     line with the then-current server output unconsumed.
 

-(4) If a line starts with three plus signs followed by a space, the rest of the
+(4) "+++ ": If a line starts with three plus signs followed by a space, the rest of the

     line specifies a number of seconds to sleep for before proceeding.
 
     line specifies a number of seconds to sleep for before proceeding.
 

-(5) If a line begins with three '>' characters and a space, the rest of the
+(5) ">>> ": If a line begins with three '>' characters and a space, the rest of the

     line is input to be sent to the server.  Backslash escaping is done as
     described below, but no trailing "\r\n" is sent.
 
     line is input to be sent to the server.  Backslash escaping is done as
     described below, but no trailing "\r\n" is sent.
 

-(6) If a line begin with three '<' characters and a space, the rest of the
-    line is a filename; the content of the file is inserted intto the script
+(6) "<<< ": If a line begin with three '<' characters and a space, the rest of the
+    line is a filename; the content of the file is inserted into the script

     at this point.
 
 (7) Otherwise, the line is an input line line that is sent to the server. Any
     at this point.
 
 (7) Otherwise, the line is an input line line that is sent to the server. Any


@@ -1109,13 +1125,16 @@ are of the following kinds:
 (2) A line that starts with "*sleep" specifies a number of seconds to wait
     before proceeding.
 
 (2) A line that starts with "*sleep" specifies a number of seconds to wait
     before proceeding.
 

-(3) A line containing "*eof" specifies that the client is expected to close
+(3) A line containing "*data" and a number specifies that the client is
+    expected to send that many byte; the server discards them
+
+(4) A line containing "*eof" specifies that the client is expected to close

     the connection at this point.
 
     the connection at this point.
 

-(4) A line containing just '.' specifies that the client is expected to send
+(5) A line containing just '.' specifies that the client is expected to send

     many lines, terminated by one that contains just a dot.
 
     many lines, terminated by one that contains just a dot.
 

-(5) Otherwise, the line defines the start of an input line that the client
+(6) Otherwise, the line defines the start of an input line that the client

     is expected to send. To allow for lines that start with digits, the line
     may start with '<', which is not taken as part of the input data. If the
     lines starts with '<<' then only the characters are expected; no return-
     is expected to send. To allow for lines that start with digits, the line
     may start with '<', which is not taken as part of the input data. If the
     lines starts with '<<' then only the characters are expected; no return-