Testsuite: TLS client testcase consolidation

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

diff --git a/test/runtest b/test/runtest
index b5ace4ee3322a7f9c8b9fe18221d85f1c40a365d..323472634a9f438b8ea007d2361806161e7b7eb1 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1489,6 +1489,8 @@ RESET_AFTER_EXTRA_LINE_READ:
 
     # Platform differences in errno strings
     s/Arg list too long/Argument list too long/;
 
     # 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/;

     }
 
   # ======== mail ========
     }
 
   # ======== mail ========


@@ -3112,7 +3114,7 @@ if (defined $parm_trusted_config_list)
   open(TCL, $parm_trusted_config_list) or die "Can't open $parm_trusted_config_list: $!\n";
   my $test_config = getcwd() . '/test-config';
   die "Can't find '$test_config' in TRUSTED_CONFIG_LIST $parm_trusted_config_list."
   open(TCL, $parm_trusted_config_list) or die "Can't open $parm_trusted_config_list: $!\n";
   my $test_config = getcwd() . '/test-config';
   die "Can't find '$test_config' in TRUSTED_CONFIG_LIST $parm_trusted_config_list."

-  if not grep { /^\Q$test_config\E$/ } <TCL>;
+    if not grep { /^\Q$test_config\E$/ } <TCL>;

   }
 else
   {
   }
 else
   {