tidying

[users/heiko/exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index 18ed0915d1a29121202a211c6322e4e39b71a51d..6cb90fb7db0c91fdb94fc1e7d44fd07bde572918 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -564,25 +564,6 @@ RESET_AFTER_EXTRA_LINE_READ:
   # signature algorithm names
   s/RSA-SHA1/RSA-SHA/;
 
   # signature algorithm names
   s/RSA-SHA1/RSA-SHA/;
 

-  # -d produces a list of environement variables as they are checked if they exist in the
-  # in the environment. Unfortunately this list isn't always in the same order. For now we
-  # just remove this list
-  #
-  if (/^\w+ in keep_environment/)
-    {
-    my @lines = $_;
-    while (<IN>)
-      {
-      if (/^\w+ in keep_environment/)
-        {
-        push @lines, $_;
-        next;
-        }
-      print MUNGED sort grep { !/^(SHLVL|_) / } @lines;
-      redo LINE;
-      }
-    }
-

 
   # ======== Caller's login, uid, gid, home, gecos ========
 
 
   # ======== Caller's login, uid, gid, home, gecos ========
 


@@ -672,6 +653,9 @@ RESET_AFTER_EXTRA_LINE_READ:
   s/waiting for children of \d+/waiting for children of pppp/;
   s/waiting for (\S+) \(\d+\)/waiting for $1 (pppp)/;
 
   s/waiting for children of \d+/waiting for children of pppp/;
   s/waiting for (\S+) \(\d+\)/waiting for $1 (pppp)/;
 

+  # The spool header file name varies with PID
+  s%^(Writing spool header file: .*/hdr).[0-9]{1,5}%$1.pppp%;
+

   # ======== Port numbers ========
   # Incoming port numbers may vary, but not in daemon startup line.
 
   # ======== Port numbers ========
   # Incoming port numbers may vary, but not in daemon startup line.
 


@@ -1023,6 +1007,23 @@ RESET_AFTER_EXTRA_LINE_READ:
       while (<IN>) { last if !/^\s/; }
       }
 
       while (<IN>) { last if !/^\s/; }
       }
 

+    # remote port numbers vary
+    s/(Connection request from 127.0.0.1 port) \d{1,5}/$1 sssss/;
+
+    # Skip hosts_require_dane checks when the options
+    # are unset, because dane ain't always there.
+
+    next if /in\shosts_require_dane\?\sno\s\(option\sunset\)/x;
+
+    # SUPPORT_PROXY
+    next if /host in hosts_proxy\?/;
+
+    # Experimental_International
+    next if / in smtputf8_advertise_hosts\? no \(option unset\)/;
+
+    # Environment cleaning
+    next if /\w+ in keep_environment\? (yes|no)/;
+

     # When Exim is checking the size of directories for maildir, it uses
     # the check_dir_size() function to scan directories. Of course, the order
     # of the files that are obtained using readdir() varies from system to
     # When Exim is checking the size of directories for maildir, it uses
     # the check_dir_size() function to scan directories. Of course, the order
     # of the files that are obtained using readdir() varies from system to


@@ -1044,20 +1045,6 @@ RESET_AFTER_EXTRA_LINE_READ:
         @saved = ();
         }
 
         @saved = ();
         }
 

-    # remote port numbers vary
-    s/(Connection request from 127.0.0.1 port) \d{1,5}/$1 sssss/;
-
-    # Skip hosts_require_dane checks when the options
-    # are unset, because dane ain't always there.
-
-    next if /in\shosts_require_dane\?\sno\s\(option\sunset\)/x;
-
-    # SUPPORT_PROXY
-    next if /host in hosts_proxy\?/;
-
-    # Experimental_International
-    next if / in smtputf8_advertise_hosts\? no \(option unset\)/;
-

       # Skip some lines that Exim puts out at the start of debugging output
       # because they will be different in different binaries.
 
       # Skip some lines that Exim puts out at the start of debugging output
       # because they will be different in different binaries.
 


@@ -1430,6 +1417,10 @@ $munges =
     { 'mainlog'   => 's/^(.* SMTP protocol synchronization error .* next input=.{8}).*$/$1<suppressed>/',
       'rejectlog' => 's/^(.* SMTP protocol synchronization error .* next input=.{8}).*$/$1<suppressed>/'},
 
     { 'mainlog'   => 's/^(.* SMTP protocol synchronization error .* next input=.{8}).*$/$1<suppressed>/',
       'rejectlog' => 's/^(.* SMTP protocol synchronization error .* next input=.{8}).*$/$1<suppressed>/'},
 

+    'debuglog_stdout' =>
+    { 'stdout' => 's/^\d\d:\d\d:\d\d\s+\d+ //;
+                  s/Process \d+ is ready for new message/Process pppp is ready for new message/'
+    },

   };
 
 
   };
 
 


@@ -1972,7 +1963,7 @@ if (/^sleep\s+(.*)$/)
 # Various Unix management commands are recognized
 
 if (/^(ln|ls|du|mkdir|mkfifo|touch|cp|cat)\s/ ||
 # Various Unix management commands are recognized
 
 if (/^(ln|ls|du|mkdir|mkfifo|touch|cp|cat)\s/ ||

-    /^sudo (rmdir|rm|chown|chmod)\s/)
+    /^sudo\s(rmdir|rm|chown|chmod)\s/)

   {
   run_system("$_ >>test-stdout 2>>test-stderr");
   return 1;
   {
   run_system("$_ >>test-stdout 2>>test-stderr");
   return 1;


@@ -1993,6 +1984,7 @@ if (/^(ln|ls|du|mkdir|mkfifo|touch|cp|cat)\s/ ||
 # command, triggered by $server_pid being non-zero. The server sends its output
 # to a different file. The variable $server_opts, if not empty, contains
 # options to disable IPv4 or IPv6 if necessary.
 # command, triggered by $server_pid being non-zero. The server sends its output
 # to a different file. The variable $server_opts, if not empty, contains
 # options to disable IPv4 or IPv6 if necessary.

+# This works because "server" swallows its stdin before waiting for a connection.

 
 if (/^server\s+(.*)$/)
   {
 
 if (/^server\s+(.*)$/)
   {


@@ -3733,8 +3725,9 @@ foreach $test (@test_list)
 
     my($subtest_startline) = $lineno;
 
 
     my($subtest_startline) = $lineno;
 

-    # Now run the command. The function returns 0 if exim was run and waited
-    # for, 1 if any other command was run and waited for, and 2 if a command
+    # Now run the command. The function returns 0 for an inline command,
+    # 1 if a non-exim command was run and waited for, 2 if an exim
+    # command was run and waited for, and 3 if a command

     # was run and not waited for (usually a daemon or server startup).
 
     my($commandname) = "";
     # was run and not waited for (usually a daemon or server startup).
 
     my($commandname) = "";