Testsuite: TLS client testcase consolidation

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

diff --git a/test/runtest b/test/runtest
index 84227b9d3a22c892dc70155976630392d8e37583..323472634a9f438b8ea007d2361806161e7b7eb1 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -461,8 +461,8 @@ RESET_AFTER_EXTRA_LINE_READ:
     my($date1,$date2,$date3,$expired) = ($1,$2,$3,$4);
     $expired = '' if !defined $expired;
 
     my($date1,$date2,$date3,$expired) = ($1,$2,$3,$4);
     $expired = '' if !defined $expired;
 

-    # Round the time-difference down to nearest even value
-    my($increment) = ((date_seconds($date3) - date_seconds($date2)) >> 1) << 1;
+    # Round the time-difference up to nearest even value
+    my($increment) = ((date_seconds($date3) - date_seconds($date2) + 1) >> 1) << 1;

 
     # We used to use globally unique replacement values, but timing
     # differences make this impossible. Just show the increment on the
 
     # We used to use globally unique replacement values, but timing
     # differences make this impossible. Just show the increment on the


@@ -780,7 +780,7 @@ RESET_AFTER_EXTRA_LINE_READ:
 
   # This handles "connection from" and the like, when the port is given
   if (!/listening for SMTP on/ && !/Connecting to/ && !/=>/ && !/->/
 
   # This handles "connection from" and the like, when the port is given
   if (!/listening for SMTP on/ && !/Connecting to/ && !/=>/ && !/->/

-      && !/\*>/ && !/Connection refused/)
+      && !/\*>/&& !/==/  && !/\*\*/ && !/Connection refused/ && !/in response to/)

     {
     s/\[([a-z\d:]+|\d+(?:\.\d+){3})\]:(\d+)/"[".$1."]:".new_value($2,"%s",\$next_port)/ie;
     }
     {
     s/\[([a-z\d:]+|\d+(?:\.\d+){3})\]:(\d+)/"[".$1."]:".new_value($2,"%s",\$next_port)/ie;
     }


@@ -1069,15 +1069,17 @@ RESET_AFTER_EXTRA_LINE_READ:
 
     # this is timing-dependent
     next if /^OpenSSL: creating STEK$/;
 
     # this is timing-dependent
     next if /^OpenSSL: creating STEK$/;

+    next if /^selfsign cert rotate$/;

 
     # TLS preload
     # only OpenSSL speaks of these
 
     # TLS preload
     # only OpenSSL speaks of these

-    next if /^TLS: preloading (DH params|ECDH curve|CA bundle) for server/;
+    next if /^TLS: (preloading (DH params|ECDH curve|CA bundle) for server|generating selfsigned server cert)/;

     next if /^Diffie-Hellman initialized from default/;
     next if /^Diffie-Hellman initialized from default/;

-    next if /^ECDH OpenSSL [< ]?[\d.+]+ temp key parameter settings:/;
-    next if /^ECDH: .'*prime256v1'/;
+    next if /^ECDH OpenSSL (< )?[\d.+]+: temp key parameter settings:/;
+    next if /^ECDH: .*'prime256v1'/;

     next if /^tls_verify_certificates: system$/;
     next if /^tls_set_watch: .*\/cert.pem/;
     next if /^tls_verify_certificates: system$/;
     next if /^tls_set_watch: .*\/cert.pem/;

+    next if /^Generating 2048 bit RSA key/;

 
     # TLS preload
     # only GnuTLS speaks of these
 
     # TLS preload
     # only GnuTLS speaks of these


@@ -1086,13 +1088,17 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /^TLS: preloading cipher list for server: NULL$/;
     s/^GnuTLS using default session cipher\/priority "NORMAL"$/TLS: not preloading cipher list for server/;
     next if /^GnuTLS<2>: added \d+ protocols, \d+ ciphersuites, \d+ sig algos and \d+ groups into priority list$/;
     next if /^TLS: preloading cipher list for server: NULL$/;
     s/^GnuTLS using default session cipher\/priority "NORMAL"$/TLS: not preloading cipher list for server/;
     next if /^GnuTLS<2>: added \d+ protocols, \d+ ciphersuites, \d+ sig algos and \d+ groups into priority list$/;

+    next if /^GnuTLS<2>: (Disabling X.509 extensions|signing structure using RSA-SHA256)/;
+    next if /^GnuTLS.*(wrap_nettle_mpi_print|gnutls_subject_alt_names_get|get_alt_name)/;

 
 

-    # only kevent platforms (FreeBSD) say this
+    # only kevent platforms (FreeBSD, OpenBSD) say this

     next if /^watch dir/;
     next if /^watch file .*\/usr\/local/;
     next if /^watch dir/;
     next if /^watch file .*\/usr\/local/;

+    next if /^watch file .*\/etc\/ssl/;

 
     # TLS preload
     # there happen in different orders for OpenSSL/GnuTLS/noTLS
 
     # TLS preload
     # there happen in different orders for OpenSSL/GnuTLS/noTLS

+    next if /^TLS: generating selfsigned server cert/;

     next if /^TLS: not preloading (CA bundle|cipher list) for server$/;
     next if /^TLS: not preloading server certs$/;
 
     next if /^TLS: not preloading (CA bundle|cipher list) for server$/;
     next if /^TLS: not preloading server certs$/;
 


@@ -1483,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 ========


@@ -3106,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
   {