X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/7e8793815bb43f97a022c6b71850206dbbd5d378..5c161fa615ab4a2d40170fedd71d1b9a7f079ff6:/test/runtest diff --git a/test/runtest b/test/runtest index cd4b7a219..b5ace4ee3 100755 --- 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 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 @@ -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/ && !/=>/ && !/->/ - && !/\*>/ && !/Connection refused/) + && !/\*>/&& !/==/ && !/\*\*/ && !/Connection refused/ && !/in response to/) { 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$/; + next if /^selfsign cert rotate$/; # 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 /^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 /^Generating 2048 bit RSA key/; # TLS preload # only GnuTLS speaks of these @@ -1086,6 +1088,8 @@ 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 /^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, OpenBSD) say this next if /^watch dir/; @@ -1094,6 +1098,7 @@ RESET_AFTER_EXTRA_LINE_READ: # 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$/;