Testsuite: munge for platform variances

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index aeb0d8f53eab91ee7fb293371db80bd913c5f31f..f90249fb8b1e55ebe20e94de952af084880389a8 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -827,11 +827,10 @@ RESET_AFTER_EXTRA_LINE_READ:
 
   # ======== IP error numbers and messages ========
   # These vary between operating systems
-  s/Can't assign requested address/Network Error/;
-  s/Cannot assign requested address/Network Error/;
+  s/Can(no|')t assign requested address/Network Error/;
   s/Operation timed out/Connection timed out/;
   s/Address family not supported by protocol family/Network Error/;
-  s/Network is unreachable/Network Error/;
+  s/Network( is)? unreachable/Network Error/;
   s/Invalid argument/Network Error/;
 
   s/\(\d+\): Network/(dd): Network/;
@@ -1047,6 +1046,7 @@ 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: | fork(?:ing|ed) for )/;
 
     # IP address lookups use gethostbyname() when IPv6 is not supported,
     # and gethostbyname2() or getipnodebyname() when it is.
@@ -1220,7 +1220,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