diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2018-11-25 21:58:54 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2018-11-25 21:58:54 +0000 |
| commit | 625f40fc27846bbb28fdd14fdc6941b99a431180 (patch) | |
| tree | 02c1b0450a2be5e13cbeb00c21ad2d7578a70ae5 | |
| parent | d0858b275a1db481912b6f6ff1513940583ebd41 (diff) | |
| download | exim4-625f40fc27846bbb28fdd14fdc6941b99a431180.tar.gz | |
Testsuite: ignore OCSP option output; fixes runs on non-OCSP builds
| -rwxr-xr-x | test/runtest | 4 | ||||
| -rw-r--r-- | test/stderr/5410 | 2 | ||||
| -rw-r--r-- | test/stderr/5820 | 2 | ||||
| -rw-r--r-- | test/stderr/5840 | 3 |
4 files changed, 3 insertions, 8 deletions
diff --git a/test/runtest b/test/runtest index 62d49adf3..2392752e4 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 3946b8f07..26302d456 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 5807a1059..b6a8db977 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 629277126..e4da8d083 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] |