X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/691ca88ca06899e02e77cb28fbf075de450607bc..35c3c48545d5bb1d98a0c4986dded979d2abe08a:/test/runtest diff --git a/test/runtest b/test/runtest index aeb0d8f53..6e6ed4092 100755 --- a/test/runtest +++ b/test/runtest @@ -1047,6 +1047,11 @@ RESET_AFTER_EXTRA_LINE_READ: s/(?<=^>>>>>>>>>>>>>>>> Exim pid=)\d+(?= terminating)/pppp/; s/^(proxy-proc \w{5}-pid) \d+$/$1 pppp/; s/^(?:\s*\d+ )(exec .* -oPX)$/pppp $1/; + next if /postfork: /; + # ipv6-enabled platforms do more loookup, for AAAAs - so ignore the forking + next if / fork(?:ing|ed) for fakens-search/; + s/ forked for [^:]+: \K\d+/npppp/; + # IP address lookups use gethostbyname() when IPv6 is not supported, # and gethostbyname2() or getipnodebyname() when it is. @@ -1220,7 +1225,7 @@ RESET_AFTER_EXTRA_LINE_READ: # daemon notifier socket s/^(\s*\d+|ppppp) (creating notifier socket)$/ppppp $2/; s/^ \@(.*exim_daemon_notify)$/ $1/; - s/^(\s*\d+|ppppp) \@(.*exim_daemon_notify)$/ppppp $2/; + s/^(\s*\d+|ppppp) \@?(.*exim_daemon_notify)$/ppppp $2/; next if /unlinking notifier socket/; # DISABLE_OCSP