X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/b0d68adc8b45e42b425c23e7dbf195b772878b9a..584e96c65f12aca9414450b656504af6e3f7a399:/test/runtest?ds=sidebyside

diff --git a/test/runtest b/test/runtest
index 2389efafe..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.
 
@@ -1415,7 +1418,7 @@ $munges =
       'rejectlog' => 's/^(.* SMTP protocol synchronization error .* next input=.{8}).*$/$1<suppressed>/'},
 
     'debuglog_stdout' =>
-    { 'stdout' => 's/^\d\d:\d\d:\d\d*  \d+ //;
+    { '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/'
     },
   };