git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Testsuite: OpenSSL version variances
[users/heiko/exim.git]
/
test
/
runtest
diff --git
a/test/runtest
b/test/runtest
index 97a32cb7ff4f2fb37fd9df3b073ee96d0460dc96..d060fda921119d00c7d3efc80689f73c4dd3af6b 100755
(executable)
--- 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 <<detail omitted>>/;
# different wording in the error messages, so we cannot compare them.
s/(TLS error on connection (?:from .* )?\(SSL_\w+\): error:)(.*)/$1 <<detail omitted>>/;
+ next if /SSL verify error: depth=0 error=certificate not trusted/;
# ======== Maildir things ========
# timestamp output in maildir processing
# ======== 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 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 ========
}
# ======== stderr ========
@@
-2852,7
+2858,7
@@
if (defined $parm_support{'Content_Scanning'})
##################################################
# Check for redis #
##################################################
##################################################
# Check for redis #
##################################################
-if (defined $parm_
support{'Experimental_R
edis'})
+if (defined $parm_
lookups{'r
edis'})
{
if (system("redis-server -v 2>/dev/null >/dev/null") == 0)
{
{
if (system("redis-server -v 2>/dev/null >/dev/null") == 0)
{