X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/fc4fcc349cf1c46dadd343b9f9fae8c232e6257e..309d78dea27ef04de75fca32e12a605571d0e515:/test/runtest?ds=inline diff --git a/test/runtest b/test/runtest index 724ccd9ed..6384f40a7 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 @@ -1392,6 +1393,9 @@ $munges = { 'mail' => '/^(X-(Remote-MTA-(smtp-greeting|helo-response)|Exim-Diagnostic|(body|message)-linecount):|Remote-MTA: X-ip;)/' }, + 'optional_dane' => + { 'stdout' => '/^hosts_(require|try)_dane =/' }, + 'sys_bindir' => { 'mainlog' => 's%/(usr/)?bin/%SYSBINDIR/%' }, @@ -2857,7 +2861,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) {