Avoid Solaris compiler issue

[users/jgh/exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index d678abda6cdc93fef7bcbddebce5af1af53fa998..1b704b1abd3eda458acd193aed093f027bece987 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -893,7 +893,7 @@ RESET_AFTER_EXTRA_LINE_READ:
   # The sizes of filter files may vary because of the substitution of local
   # filenames, logins, etc.
 
-  s/^\d+(?= bytes read from )/ssss/;
+  s/^\d+(?= (\(tainted\) )?bytes read from )/ssss/;
 
 
   # ======== OpenSSL error messages ========
@@ -943,9 +943,7 @@ RESET_AFTER_EXTRA_LINE_READ:
   # at least we'll still be checking the number of open fd's.
 
   s/max fd = \d+/max fd = dddd/;
-  s/status=0 RDONLY/STATUS/g;
-  s/status=1 WRONLY/STATUS/g;
-  s/status=2 RDWR/STATUS/g;
+  s/status=[0-9a-f]+ (?:RDONLY|WRONLY|RDWR)/STATUS/g;
 
 
   # ======== Contents of spool files ========
@@ -1322,6 +1320,7 @@ RESET_AFTER_EXTRA_LINE_READ:
 
     # Platform differences in errno strings
     s/  SMTP\(Operation timed out\)<</  SMTP(Connection timed out)<</;
+    s/Arg list too long/Argument list too long/;
 
     # Platform differences for errno values (eg. Hurd)
     s/^errno = \d+$/errno = EEE/;
@@ -1830,7 +1829,7 @@ $munges =
     },
 
     'timeout_errno' =>         # actual errno differs Solaris vs. Linux
-    { 'mainlog' => 's/(host deferral .* errno) <\d+> /$1 <EEE> /' },
+    { 'mainlog' => 's/((?:host|message) deferral .* errno) <\d+> /$1 <EEE> /' },
 
     'peer_terminated_conn' =>  # actual error differs FreedBSD vs. Linux
     { 'stderr' => 's/^(  SMTP\()Connection reset by peer(\)<<)$/$1closed$2/' },