Testsuite: output changes resulting

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index aeb0d8f53eab91ee7fb293371db80bd913c5f31f..6e6ed4092a9bba95306156c68bf796c46ff76f2d 100755 (executable)
--- 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/;
     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.
 
     # 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/;
     # 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
     next if /unlinking notifier socket/;
 
     # DISABLE_OCSP