X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=test%2Fruntest;h=57526db19db82c6f51f4c65b882a2304c136efcd;hb=131c0f8aad2e08201a3977401f15dfd2b5127b69;hp=3bd6c77bdfd254f86c826a61c5946406e40acb23;hpb=e924c08b7d031b712013a7a897e2d430b302fe6c;p=user%2Fhenk%2Fcode%2Fexim.git diff --git a/test/runtest b/test/runtest index 3bd6c77bd..57526db19 100755 --- a/test/runtest +++ b/test/runtest @@ -903,7 +903,10 @@ 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/; + + s/^(TLS error on connection .*):func\(4095\):(No such file or directory)$/$1:fopen:$2/; # gnutls version variances next if /^Error in the pull function./; @@ -1549,6 +1552,9 @@ $munges = 'timeout_errno' => # actual errno differs Solaris vs. Linux { 'mainlog' => 's/(host deferral .* errno) <\d+> /$1 /' }, + + 'peer_terminated_conn' => # actual error differs FreedBSD vs. Linux + { 'stderr' => 's/^( SMTP\()Connection reset by peer(\)<<)$/$1closed$2/' }, };