Testuite: tidying

[users/jgh/exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index 18eb4cc4e873819390063537e4c92de6d4f65e4b..2b19f52e3f511bdf88f72bfd0e0f08902b6ba9d0 100755 (executable)
--- 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/%' },