From 6471ea33fb1ddc212f1e51904ee09dcd5f64193c Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 9 Nov 2019 23:01:25 +0000 Subject: [PATCH] Testsuite: fix stderr munging Broken-by: 01446a56c7 --- test/runtest | 5 ++++- test/stderr/0438 | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/runtest b/test/runtest index 97edbc244..6e9255b33 100755 --- a/test/runtest +++ b/test/runtest @@ -1029,7 +1029,7 @@ RESET_AFTER_EXTRA_LINE_READ: s/(?<=^>>>>>>>>>>>>>>>> Exim pid=)\d+(?= terminating)/pppp/; s/^(proxy-proc \w{5}-pid) \d+$/$1 pppp/; - s/^(?:\d+)( exec .* -oPX)$/pppp$1/; + s/^(?:\s*\d+ )(exec .* -oPX)$/pppp $1/; # IP address lookups use gethostbyname() when IPv6 is not supported, # and gethostbyname2() or getipnodebyname() when it is. @@ -1047,6 +1047,9 @@ RESET_AFTER_EXTRA_LINE_READ: next if /OpenSSL compile-time version: OpenSSL \d+[\.\da-z]+/; next if /OpenSSL runtime version: OpenSSL \d+[\.\da-z]+/; + # this is timing-dependent + next if /^OpenSSL: creating STEK$/; + # drop lookups next if /^Lookups \(built-in\):/; next if /^Loading lookup modules from/; diff --git a/test/stderr/0438 b/test/stderr/0438 index bb6ba3f53..bac5bc1a6 100644 --- a/test/stderr/0438 +++ b/test/stderr/0438 @@ -54,7 +54,6 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... -OpenSSL: creating STEK pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -oP TESTSUITE/spool/mypidfile -oPX search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> -- 2.30.2