ph10 2006/10/31 11:37:47 GMT
Modified files:
exim-test README runtest
Log:
Minor tidy to test script, and update the README for some omitted
commands.
Revision Changes Path
1.5 +25 -7 exim/exim-test/README
1.15 +5 -5 exim/exim-test/runtest
Index: README
===================================================================
RCS file: /home/cvs/exim/exim-test/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- README 26 Jul 2006 14:39:13 -0000 1.4
+++ README 31 Oct 2006 11:37:47 -0000 1.5
@@ -1,12 +1,12 @@
-$Cambridge: exim/exim-test/README,v 1.4 2006/07/26 14:39:13 ph10 Exp $
+$Cambridge: exim/exim-test/README,v 1.5 2006/10/31 11:37:47 ph10 Exp $
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
@@ -602,6 +602,7 @@
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
@@ -609,19 +610,35 @@
"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.
+ 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
-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
@@ -676,6 +693,7 @@
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
@@ -712,9 +730,9 @@
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
Index: runtest
===================================================================
RCS file: /home/cvs/exim/exim-test/runtest,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- runtest 5 Sep 2006 13:24:10 -0000 1.14
+++ runtest 31 Oct 2006 11:37:47 -0000 1.15
@@ -1,6 +1,6 @@
#! /usr/bin/perl -w
-# $Cambridge: exim/exim-test/runtest,v 1.14 2006/09/05 13:24:10 ph10 Exp $
+# $Cambridge: exim/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 #
@@ -1594,12 +1594,12 @@
# 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";
