Testsuite: ignore fakens fork debug line, avoiding ipv6-support differences

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index 994ff9ff884c6cc615db23db315ea960cd5d4db2..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/;
+    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.
@@ -1218,8 +1223,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /in\shosts_require_dane\?\sno\s\(option\sunset\)/x;
 
     # daemon notifier socket
-    s/^(creating notifier socket) .*$/$1/;
-    s/^(\s*\d+|ppppp) (creating notifier socket) .+$/ppppp $2/;
+    s/^(\s*\d+|ppppp) (creating notifier socket)$/ppppp $2/;
+    s/^ \@(.*exim_daemon_notify)$/ $1/;
+    s/^(\s*\d+|ppppp)  \@?(.*exim_daemon_notify)$/ppppp  $2/;
     next if /unlinking notifier socket/;
 
     # DISABLE_OCSP