Testsuite: allow 1s timing slop in dumpdb output

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

diff --git a/test/runtest b/test/runtest
index 7e9b5d74c0fe1a3c4413b7ee8299a9ec85396f39..8a1e46edd75d3cc8115397557922db7c66aa9bdf 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;
 
-    # Round the time-difference up to nearest even value
-    my($increment) = ((date_seconds($date3) - date_seconds($date2) + 1) >> 1) << 1;
+    # Round the time-difference down to nearest even value
+    my($increment) = ((date_seconds($date3) - date_seconds($date2)) >> 1) << 1;
 
     # We used to use globally unique replacement values, but timing
     # differences make this impossible. Just show the increment on the
@@ -1075,7 +1075,8 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /^TLS: preloading DH params for server/;
     next if /^Diffie-Hellman initialized from default/;
     next if /^TLS: preloading ECDH curve for server/;
-    next if /^ECDH OpenSSL [\d.+]+ temp key parameter settings:/;
+    next if /^ECDH OpenSSL [< ]?[\d.+]+ temp key parameter settings:/;
+    next if /^ECDH: .'*prime256v1'/;
     next if /^watch dir/;
 
     # TLS preload