X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/bdf36f7cd98fba7717e078de8c6f6bd3e5927cae..5f921f97ea35dc788cebd28adbf95877a25a5b1a:/test/runtest diff --git a/test/runtest b/test/runtest index 97a32cb7f..d060fda92 100755 --- a/test/runtest +++ b/test/runtest @@ -771,6 +771,7 @@ RESET_AFTER_EXTRA_LINE_READ: # different wording in the error messages, so we cannot compare them. s/(TLS error on connection (?:from .* )?\(SSL_\w+\): error:)(.*)/$1 <>/; + next if /SSL verify error: depth=0 error=certificate not trusted/; # ======== Maildir things ======== # timestamp output in maildir processing @@ -857,6 +858,11 @@ RESET_AFTER_EXTRA_LINE_READ: next if /^SSL info: unknown state/; next if /^SSL info: SSLv2\/v3 write client hello A/; next if /^SSL info: SSLv3 read server key exchange A/; + next if /SSL verify error: depth=0 error=certificate not trusted/; + s/SSL3_READ_BYTES/ssl3_read_bytes/; + + # gnutls version variances + next if /^Error in the pull function./; } # ======== stderr ======== @@ -2852,7 +2858,7 @@ if (defined $parm_support{'Content_Scanning'}) ################################################## # Check for redis # ################################################## -if (defined $parm_support{'Experimental_Redis'}) +if (defined $parm_lookups{'redis'}) { if (system("redis-server -v 2>/dev/null >/dev/null") == 0) {