X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/a2da3176aa39ec9aa5ae495e5a6d533477f871aa..d98cf5e57ce7376388c1ff55a82d0900c0acf38b:/test/runtest?ds=inline

diff --git a/test/runtest b/test/runtest
index fb93d8de3..6cb90fb7d 100755
--- a/test/runtest
+++ b/test/runtest
@@ -653,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)/;
 
+  # 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.
 
@@ -1021,9 +1024,6 @@ RESET_AFTER_EXTRA_LINE_READ:
     # Environment cleaning
     next if /\w+ in keep_environment\? (yes|no)/;
 
-    # The spool header file name varies with PID
-    s%^(Writing spool header file: .*/hdr).[0-9]{1,5}%$1.pppp%;
-
     # 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
@@ -1417,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>/'},
 
+    '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/'
+    },
   };