Testsuite: TLS server testcase consolidation

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index 323472634a9f438b8ea007d2361806161e7b7eb1..ba2450c458095bdc840a8cbb30b3caf6e62ddbfd 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1490,7 +1490,10 @@ RESET_AFTER_EXTRA_LINE_READ:
     # Platform differences in errno strings
     s/Arg list too long/Argument list too long/;
 
-    s/session: \((SSL_connect|gnutls_handshake)\): timed out/session: (tls lib connect fn): timed out/;
+    # OpenSSL vs. GnuTLS
+    s/session: \K\((SSL_connect|gnutls_handshake)\): timed out/(tls lib connect fn): timed out/;
+    s/TLS error on connection from .*\K\((SSL_accept|gnutls_handshake)\): timed out/(tls lib accept fn): timed out/;
+    s/TLS error on connection from .*\K(SSL_accept: TCP connection closed by peer|\(gnutls_handshake\): The TLS connection was non-properly terminated.)/(tls lib accept fn): TCP connection closed by peer/;
     }
 
   # ======== mail ========