[exim-cvs] Testsuite: ignore OCSP option output; fixes runs…

Gitweb: https://git.exim.org/exim.git/commitdiff/625f40fc27846bbb28fdd14fdc6941b99a431180

Commit:     625f40fc27846bbb28fdd14fdc6941b99a431180
Parent:     d0858b275a1db481912b6f6ff1513940583ebd41
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Nov 25 21:58:54 2018 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sun Nov 25 21:58:54 2018 +0000

    Testsuite: ignore OCSP option output; fixes runs on non-OCSP builds
---
 test/runtest     | 4 +++-
 test/stderr/5410 | 2 --
 test/stderr/5820 | 2 --
 test/stderr/5840 | 3 ---
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/test/runtest b/test/runtest
index 62d49ad..2392752 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1109,9 +1109,11 @@ RESET_AFTER_EXTRA_LINE_READ:

     # Skip hosts_require_dane checks when the options
     # are unset, because dane ain't always there.
-
     next if /in\shosts_require_dane\?\sno\s\(option\sunset\)/x;

+    # DISABLE_OCSP 
+    next if /in hosts_requ(est|ire)_ocsp\? (no|yes)/;
+
     # SUPPORT_PROXY
     next if /host in hosts_proxy\?/;

diff --git a/test/stderr/5410 b/test/stderr/5410
index 3946b8f..26302d4 100644
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -104,8 +104,6 @@ cmd buf flush ddd bytes
SMTP>> STARTTLS
cmd buf flush ddd bytes
SMTP<< 220 TLS go ahead
-127.0.0.1 in hosts_require_ocsp? no (option unset)
-127.0.0.1 in hosts_request_ocsp? yes (matched "*")
127.0.0.1 in tls_verify_hosts? no (option unset)
127.0.0.1 in tls_try_verify_hosts? no (end of list)
SMTP>> EHLO myhost.test.ex
diff --git a/test/stderr/5820 b/test/stderr/5820
index 5807a10..b6a8db9 100644
--- a/test/stderr/5820
+++ b/test/stderr/5820
@@ -38,8 +38,6 @@
>>> SMTP>> STARTTLS
>>> cmd buf flush 10 bytes
>>> SMTP<< 220 TLS go ahead
->>> ip4.ip4.ip4.ip4 in hosts_require_ocsp? no (option unset)
->>> ip4.ip4.ip4.ip4 in hosts_request_ocsp? yes (matched "*")
>>> SMTP>> EHLO myhost.test.ex
>>> cmd buf flush 21 bytes
>>> SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
diff --git a/test/stderr/5840 b/test/stderr/5840
index 6292771..e4da8d0 100644
--- a/test/stderr/5840
+++ b/test/stderr/5840
@@ -38,9 +38,6 @@
>>> SMTP>> STARTTLS
>>> cmd buf flush 10 bytes
>>> SMTP<< 220 TLS go ahead
->>> ip4.ip4.ip4.ip4 in hosts_require_ocsp? no (option unset)
->>> ip4.ip4.ip4.ip4 in hosts_require_ocsp? no (option unset)
->>> ip4.ip4.ip4.ip4 in hosts_request_ocsp? no (end of list)
>>> SMTP>> EHLO myhost.test.ex
>>> cmd buf flush 21 bytes
>>> SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]