diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2022-01-30 13:49:33 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2022-01-30 13:49:33 +0000 |
| commit | 4b7a5d8aea1153d5204ba2a2bd1cabc3cbfe5056 (patch) | |
| tree | 6d69335a687f4b414cf599524439754f48e078dc | |
| parent | 10d0e7206d88d1fb811b01e49181187579f77e9c (diff) | |
Testsuite: munge for more platform variabilities
Broken-by: 9dea8f12c7
| -rwxr-xr-x | test/runtest | 4 | ||||
| -rw-r--r-- | test/stderr/0574 | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/test/runtest b/test/runtest index 89f734554..10f5e4415 100755 --- a/test/runtest +++ b/test/runtest @@ -1120,7 +1120,7 @@ RESET_AFTER_EXTRA_LINE_READ: next if /^Lookups \(built-in\):/; next if /^Loading lookup modules from/; next if /^Loaded \d+ lookup modules/; - next if /^Total \d+ lookups/; + next if /^(?:\d\d:\d\d:\d\d \d+ )?Total \d+ lookups/; # drop compiler information next if /^Compiler:/; @@ -1449,7 +1449,7 @@ RESET_AFTER_EXTRA_LINE_READ: /^Routers:/ || /^Transports:/ || /^Malware:/ || - /^log selectors =/ || + /^(?:\d\d:\d\d:\d\d \d+ )?log selectors =/ || /^cwd=/ || /^Fixed never_users:/ || /^Configure owner:/ || diff --git a/test/stderr/0574 b/test/stderr/0574 index 1e82394e9..4700343ef 100644 --- a/test/stderr/0574 +++ b/test/stderr/0574 @@ -22,13 +22,11 @@ 01:01:01 1234 LOG: smtp_connection MAIN 01:01:01 1234 SMTP connection from (test.ex) [127.0.0.1] closed by QUIT 01:01:01 1237 Exim version x.yz uid=EXIM_UID gid=EXIM_GID pid=pppp D=fff9ffff -01:01:01 1237 Total 25 lookups 01:01:01 1237 macros_trusted overridden to true by whitelisting 01:01:01 1237 changed uid/gid: forcing real = effective 01:01:01 1237 uid=uuuu gid=EXIM_GID pid=pppp 01:01:01 1237 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys 01:01:01 1237 configuration file is TESTSUITE/test-config -01:01:01 1237 log selectors = 00000ffc 64205022 0000000c 01:01:01 1237 cwd=TESTSUITE/spool 10 args: TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xfff9ffff -MCd daemon-accept-delivery -Mc 10HmaX-0005vi-00 01:01:01 1237 trusted user 01:01:01 1237 admin user |