X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d0eb2d4579a562f40f4c36b22d47c0225f61b667..f5978b01c1ee361862af1d558bfee43efcb435a6:/test/runtest diff --git a/test/runtest b/test/runtest index eac861671..bdfe32b08 100755 --- a/test/runtest +++ b/test/runtest @@ -903,7 +903,8 @@ RESET_AFTER_EXTRA_LINE_READ: next if /^SSL info:/; next if /SSL verify error: depth=0 error=certificate not trusted/; s/SSL3_READ_BYTES/ssl3_read_bytes/i; - s/^\d+:error:\d+(:SSL routines:ssl3_read_bytes:[^:]+:).*(:SSL alert number \d\d)$/pppp:error:dddddddd$1\[...\]$2/; + s/CONNECT_CR_FINISHED/ssl3_read_bytes/i; + s/^\d+:error:\d+(?:E\d+)?(:SSL routines:ssl3_read_bytes:[^:]+:).*(:SSL alert number \d\d)$/pppp:error:dddddddd$1\[...\]$2/; # gnutls version variances next if /^Error in the pull function./; @@ -1168,6 +1169,10 @@ RESET_AFTER_EXTRA_LINE_READ: # CHUNKING: exact sizes depend on hostnames in headers s/(=>.* K C="250- \d)\d+ (byte chunk, total \d)\d+/$1nn $2nn/; + + # openssl version variances + s/(TLS error on connection .*: error:)[0-9A-F]{8}(:system library):func\(4095\):(No such file or + directory)$/$1xxxxxxxx$2:fopen:$3/; } # ======== All files other than stderr ========