X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=test%2Fruntest;h=7bf74d7e1b1178df17484b34f1e8af7ff81ddfbd;hb=b83823bd386eb32cd37b8087429ff58fd21d0f2e;hp=fbc4fc484f3cdc3f9cf63df7e19fd8bb20792669;hpb=4af1b6cad6bbf0856e07cc99ab09257be652b819;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/test/runtest b/test/runtest
index fbc4fc484..7bf74d7e1 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1019,6 +1019,9 @@ RESET_AFTER_EXTRA_LINE_READ:
         @saved = ();
         }
 
+    # remote port numbers vary
+    s/(Connection request from 127.0.0.1 port) \d{1,5}/$1 sssss/;
+
     # Skip hosts_require_dane checks when the options
     # are unset, because dane ain't always there.
 
@@ -1379,7 +1382,7 @@ $munges =
     { 'mainlog' => 's/ X=TLS\S+ / X=TLS_proto_and_cipher /' },
 
     'debug_pid' =>
-    { 'stderr' => 's/\d{1,5}/ppppp/g' },
+    { 'stderr' => 's/(^\s{0,4}|(?<=Process )|(?<=child ))\d{1,5}/ppppp/g' },
 
   };
 
@@ -2390,7 +2393,7 @@ if ($parm_exim eq "")
     # directory. Thus, we should choose the highest version of Exim that has
     # been compiled.
 
-    if ($f eq "exim4" || $f eq "exim-snapshot")
+    if ($f eq "exim4" || $f eq "exim-snapshot" || $f eq 'src')
       { $srcdir = $f; }
     else
       { $srcdir = $f