X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/fc1c08204f41dc2ac4200677c2c60c6fe6c5c3b7..c4a8c663b74a35b547d8320547079ca56b3b772e:/test/runtest diff --git a/test/runtest b/test/runtest index 62d49adf3..39e87629e 100755 --- a/test/runtest +++ b/test/runtest @@ -479,6 +479,10 @@ RESET_AFTER_EXTRA_LINE_READ: # port numbers in dumpdb output s/T:([a-z.]+(:[0-9.]+)?):$parm_port_n /T:$1:PORT_N /; + # port numbers in stderr + s/^set_process_info: .*\]:\K$parm_port_d /PORT_D /; + s/^set_process_info: .*\]:\K$parm_port_s /PORT_S /; + # ======== Dates and times ======== @@ -520,7 +524,7 @@ RESET_AFTER_EXTRA_LINE_READ: my($next) = $3 - $2; $_ = " first failed=dddd last try=dddd next try=+$next $4\n"; } - s/^(\s*)now=\d+ first_failed=\d+ next_try=\d+ expired=(\d)/$1now=tttt first_failed=tttt next_try=tttt expired=$2/; + s/^(\s*)now=\d+ first_failed=\d+ next_try=\d+ expired=(\w)/$1now=tttt first_failed=tttt next_try=tttt expired=$2/; s/^(\s*)received_time=\d+ diff=\d+ timeout=(\d+)/$1received_time=tttt diff=tttt timeout=$2/; # Time to retry may vary @@ -1109,9 +1113,11 @@ RESET_AFTER_EXTRA_LINE_READ: # Skip hosts_require_dane checks when the options # are unset, because dane ain't always there. - next if /in\shosts_require_dane\?\sno\s\(option\sunset\)/x; + # DISABLE_OCSP + next if /in hosts_requ(est|ire)_ocsp\? (no|yes)/; + # SUPPORT_PROXY next if /host in hosts_proxy\?/;