Minor tidy to test script, and update the README for some omitted

commands.

diff --git a/test/README b/test/README
index 232b9e96c66389917c5a898ba60e6dcf47ced3fc..43d641375f2d6ddf935ccb2581dc491d5d4a93b6 100644 (file)
--- a/test/README
+++ b/test/README
@@ -1,12 +1,12 @@
-$Cambridge: exim/test/README,v 1.4 2006/07/26 14:39:13 ph10 Exp $
+$Cambridge: exim/test/README,v 1.5 2006/10/31 11:37:47 ph10 Exp $

 
 EXPORTABLE EXIM TEST SUITE
 --------------------------
 
 This document last updated for:
 
 
 EXPORTABLE EXIM TEST SUITE
 --------------------------
 
 This document last updated for:
 

-Test Suite Version: 4.63
-Date: 25 July 2006
+Test Suite Version: 4.64
+Date: 31 October 2006

 
 
 BACKGROUND
 
 
 BACKGROUND


@@ -602,6 +602,7 @@ Commands with no input
 
 These commands are not followed by any input data, or by a line of asterisks.
 
 
 These commands are not followed by any input data, or by a line of asterisks.
 

+

   dbmbuild <file1> <file1>
 
 This command runs the exim_dbmbuild utility to build a DBM file. It is used
   dbmbuild <file1> <file1>
 
 This command runs the exim_dbmbuild utility to build a DBM file. It is used


@@ -609,19 +610,35 @@ only when DBM support is available in Exim, and typically follows the use of a
 "write" command (see below) that creates the input file.
 
 
 "write" command (see below) that creates the input file.
 
 

+  dumpdb <dbname>
+
+This command runs the exim_dumpdb utility on the testing spool directory, using
+the database name given, for example: "dumpdb retry".
+
+

   echo <text>
 
 The text is written to the screen; this is used to output comments from
 scripts.
 
 
   echo <text>
 
 The text is written to the screen; this is used to output comments from
 scripts.
 
 

+  exim_lock [options] <file name>
+
+This command runs the exim_lock utility with the given options and file name.
+The file remains locked with the following command (normally exim) is obeyed.
+
+
+  exinext <data>
+
+This command runs the exinext utility with the given argument data.
+
+

   gnutls
 
 This command is present at the start of all but one of the tests that use
 GnuTLS. It copies a pre-existing parameter file into the spool directory, so
 that Exim does not have to re-create the file each time. The first GnuTLS test
   gnutls
 
 This command is present at the start of all but one of the tests that use
 GnuTLS. It copies a pre-existing parameter file into the spool directory, so
 that Exim does not have to re-create the file each time. The first GnuTLS test

-does not do this, in order to test that Exim can create the file (it takes some
-time).
+does not do this, in order to test that Exim can create the file.

 
 
   killdaemon
 
 
   killdaemon


@@ -676,6 +693,7 @@ If this command is encountered anywhere in the script, message log files that
 are still in existence at the end of the run (for messages that were not
 delivered) are not compared with saved versions.
 
 are still in existence at the end of the run (for messages that were not
 delivered) are not compared with saved versions.
 

+

   no_stderr_check
 
 If this command is encountered anywhere in the script, the stderr output from
   no_stderr_check
 
 If this command is encountered anywhere in the script, the stderr output from


@@ -712,9 +730,9 @@ deliveries because on different systems the processes may terminate in a
 different order.
 
 
 different order.
 
 

-A number of standard file management commands are recognized. These are cat,
-chmod, chown, cp, ln, ls, du, mkdir, mkfifo, rm, rmdir, and touch. Some are run
-as root using "sudo".
+A number of standard file management commands are also recognized. These are
+cat, chmod, chown, cp, du, ln, ls, du, mkdir, mkfifo, rm, rmdir, and touch.
+Some are run as root using "sudo".

 
 
 Commands with input
 
 
 Commands with input

diff --git a/test/runtest b/test/runtest
index 66a0197b94dc6e1a1a150b504d09c8db322dacdf..d24f4bba293e34f1f5e48fa5c470eace242b9b21 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
 #! /usr/bin/perl -w
 

-# $Cambridge: exim/test/runtest,v 1.14 2006/09/05 13:24:10 ph10 Exp $
+# $Cambridge: exim/test/runtest,v 1.15 2006/10/31 11:37:47 ph10 Exp $

 
 ###############################################################################
 # This is the controlling script for the "new" test suite for Exim. It should #
 
 ###############################################################################
 # This is the controlling script for the "new" test suite for Exim. It should #


@@ -1594,12 +1594,12 @@ if (/^(cat)?write\s+(\S+)(?:\s+(.*))?\s*$/)
 # command in the variable $cmd. Shared code to run this command and handle its
 # input and output follows.
 
 # command in the variable $cmd. Shared code to run this command and handle its
 # input and output follows.
 

-# The "client" and "client-ssl" commands run a script-driven program that plays
-# the part of an email client. We also have the availability of running Perl
-# for doing one-off special things. Note that all these commands expect stdin
-# data to be supplied.
+# The "client", "client-gnutls", and "client-ssl" commands run a script-driven
+# program that plays the part of an email client. We also have the availability
+# of running Perl for doing one-off special things. Note that all these
+# commands expect stdin data to be supplied.

 
 

-if (/^client/ || /^client-ssl/ || /^(sudo\s+)?perl\b/)
+if (/^client/ || /^(sudo\s+)?perl\b/)

   {
   s"client"./bin/client";
   $cmd = "$_ >>test-stdout 2>>test-stderr";
   {
   s"client"./bin/client";
   $cmd = "$_ >>test-stdout 2>>test-stderr";