summaryrefslogtreecommitdiff
path: root/test/runtest
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2016-01-18 16:54:45 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2016-01-18 16:54:45 +0000
commit4dce3152ce5e257dde0575dc2fab4121d127dfb5 (patch)
treee46bd911cb3dde6fdf8c766e3c08565110d5ee43 /test/runtest
parent8d6d5106a6f1bcba010877d55932a8d8dcfa88bd (diff)
Testuite: tidyingexim-4_87_RC3
Diffstat (limited to 'test/runtest')
-rwxr-xr-xtest/runtest10
1 files changed, 8 insertions, 2 deletions
diff --git a/test/runtest b/test/runtest
index 18eb4cc4e..2b19f52e3 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1393,8 +1393,14 @@ $munges =
{ 'mail' => '/^(X-(Remote-MTA-(smtp-greeting|helo-response)|Exim-Diagnostic|(body|message)-linecount):|Remote-MTA: X-ip;)/'
},
- 'optional_dane_ocsp' =>
- { 'stdout' => '/^hosts_(requ(est|ire)|try)_(dane|ocsp) =/' },
+ 'optional_nossl' =>
+ { 'stdout' => '/^(
+ dkim_(canon|domain|private_key|selector|sign_headers|strict)
+ |gnutls_require_(kx|mac|protocols)
+ |hosts_(requ(est|ire)|try)_(dane|ocsp)
+ |hosts_(avoid|nopass|require|verify_avoid)_tls
+ |tls_[^ ]*
+ )($|[ ]=)/x' },
'sys_bindir' =>
{ 'mainlog' => 's%/(usr/)?bin/%SYSBINDIR/%' },