From d20ede8da27eb2a848f3ed0d1bc71b70ace2a2f2 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sat, 16 Jan 2016 18:04:55 +0000
Subject: [PATCH] Testsuite: ignore optional OCSP output from -bP testcase

---
 test/runtest                 | 4 ++--
 test/scripts/0000-Basic/0572 | 2 +-
 test/stdout/0572             | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/test/runtest b/test/runtest
index 6384f40a7..18eb4cc4e 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1393,8 +1393,8 @@ $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_dane_ocsp' =>
+    { 'stdout' => '/^hosts_(requ(est|ire)|try)_(dane|ocsp) =/' },
 
     'sys_bindir' =>
     { 'mainlog' => 's%/(usr/)?bin/%SYSBINDIR/%' },
diff --git a/test/scripts/0000-Basic/0572 b/test/scripts/0000-Basic/0572
index cbd1cc9db..6bc42fde1 100644
--- a/test/scripts/0000-Basic/0572
+++ b/test/scripts/0000-Basic/0572
@@ -3,7 +3,7 @@
 # Ought to test a non-priv user, checking "hide", but
 # the testsuite cannot do that...
 #
-munge optional_dane
+munge optional_dane_ocsp
 exim -bP spool_directory
 ****
 perl -e 'print "\n";'
diff --git a/test/stdout/0572 b/test/stdout/0572
index bd537bc44..08b69f4e9 100644
--- a/test/stdout/0572
+++ b/test/stdout/0572
@@ -66,9 +66,7 @@ hosts_max_try_hardlimit = 50
 hosts_nopass_tls = 
 no_hosts_override
 no_hosts_randomize
-hosts_request_ocsp = *
 hosts_require_auth = 
-hosts_require_ocsp = 
 hosts_require_tls = 
 hosts_try_auth = 
 hosts_try_prdr = *
-- 
2.30.2