X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/562a0e6f53f497710939fd7b4d16dd936919245c..cff70eb1c1eb494ee5964dca33dc115181baafd7:/test/runtest diff --git a/test/runtest b/test/runtest index b2f5d0775..d117751c4 100755 --- a/test/runtest +++ b/test/runtest @@ -800,7 +800,10 @@ RESET_AFTER_EXTRA_LINE_READ: # numbers, or handle specific bad conditions in different ways, leading to # different wording in the error messages, so we cannot compare them. - s/(TLS error on connection (?:from .* )?\(SSL_\w+\): error:)(.*)/$1 <>/; +#XXX This loses any trailing "deliving unencypted to" which is unfortunate +# but I can't work out how to deal with that. + s/(TLS session: \(SSL_\w+\): error:)(.*)(?!: delivering)/$1 <>/; + s/(TLS error on connection from .* \(SSL_\w+\): error:)(.*)/$1 <>/; next if /SSL verify error: depth=0 error=certificate not trusted/; # ======== Maildir things ========