diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2017-02-10 11:36:52 +0000 |
|---|---|---|
| committer | Phil Pennock <pdp@exim.org> | 2017-03-04 15:40:19 -0500 |
| commit | 2351087e18b05f8608f18abec547d72e5a2c0fe5 (patch) | |
| tree | d186d9d7e99eb546756a76158b51f65b76a22410 | |
| parent | 85cd914bd0ac451c1c7a1ad23a51a52dad766f69 (diff) | |
| download | exim4-2351087e18b05f8608f18abec547d72e5a2c0fe5.tar.gz | |
Testsuite: fix munging of now-indented date in stdout
Broken-by: e1d04f48a45c
(cherry picked from commit e51462229029e40afa0932dd9c6337192a0dc70b)
Signed-off-by: Phil Pennock <pdp@exim.org>
| -rwxr-xr-x | test/runtest | 2 | ||||
| -rw-r--r-- | test/stdout/0574 | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/runtest b/test/runtest index b2f5d0775..59f61c6a6 100755 --- a/test/runtest +++ b/test/runtest @@ -1522,7 +1522,7 @@ $munges = '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/' }, diff --git a/test/stdout/0574 b/test/stdout/0574 index d32dfea42..3a4839d94 100644 --- 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 - 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 |