Log local IP on delivery log line, under the incoming_interface log selector. Bug 507

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index 9fd8188793626266a7d87dc8d544c36f4223131e..c6d9c729e22c4bc1cb61d6c12e0859f2bdff691b 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -491,6 +491,9 @@ RESET_AFTER_EXTRA_LINE_READ:
   s/Exim\sstatistics\sfrom\s\d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d\sto\s
     \d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d/Exim statistics from <time> to <time>/x;
 
+  # Treat ECONNRESET the same as ECONNREFUSED.  At least some systems give
+  # us the former on a new connection.
+  s/(could not connect to .*: Connection) reset by peer$/$1 refused/;
 
   # ======== TLS certificate algorithms ========
   # Test machines might have various different TLS library versions supporting
@@ -806,7 +809,7 @@ RESET_AFTER_EXTRA_LINE_READ:
 
   # ==========================================================
   # MIME boundaries in RFC3461 DSN messages
-  s/\d{8,10}-eximdsn-\d{8,10}/NNNNNNNNNN-eximdsn-MMMMMMMMMM/;
+  s/\d{8,10}-eximdsn-\d+/NNNNNNNNNN-eximdsn-MMMMMMMMMM/;
 
   # ==========================================================
   # Some munging is specific to the specific file types
@@ -1683,7 +1686,7 @@ if (/^dump\s+(\S+)/)
 
     foreach $item (@temp)
       {
-      $item =~ s/^\s*(.*)\n(.*)\n?\s*$/\1\n\2/m;
+      $item =~ s/^\s*(.*)\n(.*)\n?\s*$/$1\n$2/m;
       print OUT "  $item\n";
       }
     }