X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/79c904e1038ff8201ba51c8d69e26fef20017da0..61fd9a693285fe264aa67ffa0ef042a68c63c5cd:/test/runtest diff --git a/test/runtest b/test/runtest index 6384f40a7..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' => - { 'stdout' => '/^hosts_(require|try)_dane =/' }, + '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/%' },