X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/b3ef41c94af9aefec7b6855cf2ce73ffeaba9d9a..fdd3478e184a82c862b32e06aa812f94f06768f7:/test/runtest?ds=sidebyside diff --git a/test/runtest b/test/runtest index 616ded37c..fcc7a972e 100755 --- a/test/runtest +++ b/test/runtest @@ -875,7 +875,7 @@ RESET_AFTER_EXTRA_LINE_READ: # IP address lookups use gethostbyname() when IPv6 is not supported, # and gethostbyname2() or getipnodebyname() when it is. - s/\bgethostbyname2?|\bgetipnodebyname/get[host|ipnode]byname[2]/; + s/\b(gethostbyname2?|\bgetipnodebyname)(\(af=inet\))?/get[host|ipnode]byname[2]/; # drop gnutls version strings next if /GnuTLS compile-time version: \d+[\.\d]+$/; @@ -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. @@ -1378,6 +1381,9 @@ $munges = 'tls_anycipher' => { 'mainlog' => 's/ X=TLS\S+ / X=TLS_proto_and_cipher /' }, + 'debug_pid' => + { 'stderr' => 's/(^\s{0,4}|(?<=Process )|(?<=child ))\d{1,5}/ppppp/g' }, + };