Testsuite: ignore dane for -bP output

diff --git a/test/runtest b/test/runtest
index d060fda921119d00c7d3efc80689f73c4dd3af6b..6384f40a7e746dcaf3380b3b5bbe84b715042a91 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1393,6 +1393,9 @@ $munges =
     { 'mail' => '/^(X-(Remote-MTA-(smtp-greeting|helo-response)|Exim-Diagnostic|(body|message)-linecount):|Remote-MTA: X-ip;)/'
     },
 
     { '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/%' },
 
     'sys_bindir' =>
     { 'mainlog' => 's%/(usr/)?bin/%SYSBINDIR/%' },
 

diff --git a/test/scripts/0000-Basic/0572 b/test/scripts/0000-Basic/0572
index 3525333c6148e9a0963663578d47d12e4dffceef..cbd1cc9dbe383e62dd11c13937f709b64d007b29 100644 (file)
--- a/test/scripts/0000-Basic/0572
+++ b/test/scripts/0000-Basic/0572
@@ -3,6 +3,7 @@
 # Ought to test a non-priv user, checking "hide", but
 # the testsuite cannot do that...
 #
 # Ought to test a non-priv user, checking "hide", but
 # the testsuite cannot do that...
 #

+munge optional_dane

 exim -bP spool_directory
 ****
 perl -e 'print "\n";'
 exim -bP spool_directory
 ****
 perl -e 'print "\n";'

diff --git a/test/stdout/0572 b/test/stdout/0572
index ec427ae623718f4ae4a32f11c55858725ecd94be..87a02d3ed0c315d48972edff47507c1e5a31fbd2 100644 (file)
--- a/test/stdout/0572
+++ b/test/stdout/0572
@@ -68,11 +68,9 @@ no_hosts_override
 no_hosts_randomize
 hosts_request_ocsp = *
 hosts_require_auth = 
 no_hosts_randomize
 hosts_request_ocsp = *
 hosts_require_auth = 

-hosts_require_dane = 

 hosts_require_ocsp = 
 hosts_require_tls = 
 hosts_try_auth = 
 hosts_require_ocsp = 
 hosts_require_tls = 
 hosts_try_auth = 

-hosts_try_dane = 

 hosts_try_prdr = *
 hosts_verify_avoid_tls = 
 interface = ip4.ip4.ip4.ip4
 hosts_try_prdr = *
 hosts_verify_avoid_tls = 
 interface = ip4.ip4.ip4.ip4