Testsuite: pass GnuTLS despite OCSP whining

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

diff --git a/test/runtest b/test/runtest
index df6132b98afc42f42b5ee143eca92da3a88f30e0..1cf6aadfa72ae2659d9a2bec48ea02f0ae7e7f93 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -773,6 +773,9 @@ RESET_AFTER_EXTRA_LINE_READ:
 
   s/(TLS error on connection (?:from .* )?\(SSL_\w+\): error:)(.*)/$1 <<detail omitted>>/;
 
+  # ======== GnuTLS problems ========
+  next if /OCSP unusable with this GnuTLS library version/;
+
   # ======== Maildir things ========
   # timestamp output in maildir processing
   s/(timestamp=|\(timestamp_only\): )\d+/$1ddddddd/g;
@@ -875,7 +878,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 +1022,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 +1385,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' },
 
   };