diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2016-01-06 21:33:19 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2016-01-06 21:33:19 +0000 |
| commit | 79c904e1038ff8201ba51c8d69e26fef20017da0 (patch) | |
| tree | 50fb56e4b97b612b15a3ba592d366bcc067eff44 | |
| parent | 5d4d1346f7b25ca758f0d13778e229376784700b (diff) | |
Testsuite: ignore dane for -bP output
| -rwxr-xr-x | test/runtest | 3 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0572 | 1 | ||||
| -rw-r--r-- | test/stdout/0572 | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/test/runtest b/test/runtest index d060fda92..6384f40a7 100755 --- 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;)/' }, + 'optional_dane' => + { 'stdout' => '/^hosts_(require|try)_dane =/' }, + 'sys_bindir' => { 'mainlog' => 's%/(usr/)?bin/%SYSBINDIR/%' }, diff --git a/test/scripts/0000-Basic/0572 b/test/scripts/0000-Basic/0572 index 3525333c6..cbd1cc9db 100644 --- 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... # +munge optional_dane exim -bP spool_directory **** perl -e 'print "\n";' diff --git a/test/stdout/0572 b/test/stdout/0572 index ec427ae62..87a02d3ed 100644 --- a/test/stdout/0572 +++ b/test/stdout/0572 @@ -68,11 +68,9 @@ no_hosts_override no_hosts_randomize hosts_request_ocsp = * hosts_require_auth = -hosts_require_dane = hosts_require_ocsp = hosts_require_tls = hosts_try_auth = -hosts_try_dane = hosts_try_prdr = * hosts_verify_avoid_tls = interface = ip4.ip4.ip4.ip4 |