Testsuite: fix munging of now-indented date in stdout

Broken-by: e1d04f48a45c

diff --git a/test/runtest b/test/runtest
index b2f5d077573e6c0f9c60ad82e95cdfbc48bd7b10..59f61c6a6fb5b0bf5bdc6bc91caae25b3503d2fe 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1522,7 +1522,7 @@ $munges =
       'rejectlog' => 's/^(.* SMTP protocol synchronization error .* next input=.{8}).*$/$1<suppressed>/'},
 
     'debuglog_stdout' =>
       'rejectlog' => 's/^(.* SMTP protocol synchronization error .* next input=.{8}).*$/$1<suppressed>/'},
 
     'debuglog_stdout' =>

-    { 'stdout' => 's/^\d\d:\d\d:\d\d\s+\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/'
     },
 
                   s/Process \d+ is ready for new message/Process pppp is ready for new message/'
     },
 

diff --git a/test/stdout/0574 b/test/stdout/0574
index d32dfea42cf1f490e8e8142fceafd9e91306da56..3a4839d9419306e518bee0e4ab0e781825229ba5 100644 (file)
--- a/test/stdout/0574
+++ b/test/stdout/0574
@@ -35,9 +35,9 @@ accept: condition test succeeded in ACL "chk_data"
 end of ACL "chk_data": ACCEPT
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 end of ACL "chk_data": ACCEPT
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL

- 16:20:24 28641 /considering: ${tod_full}
- 16:20:24 28641 |__expanding: ${tod_full}
- 16:20:24 28641 \_____result: Tue, 2 Mar 1999 09:44:33 +0000
+/considering: ${tod_full}
+|__expanding: ${tod_full}
+\_____result: Tue, 2 Mar 1999 09:44:33 +0000

 Writing spool header file: TESTSUITE/spool//input//hdr.pppp
 DSN: Write SPOOL :-dsn_envid NULL
 DSN: Write SPOOL :-dsn_ret 0
 Writing spool header file: TESTSUITE/spool//input//hdr.pppp
 DSN: Write SPOOL :-dsn_envid NULL
 DSN: Write SPOOL :-dsn_ret 0