Testsuite: munges to support no-ssl builds

6 files changed, 6 insertions, 15 deletions

diff --git a/test/runtest b/test/runtest
index cde86047b..1c44e01be 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1043,6 +1043,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     # TLS resumption is not always supported by the build
     next if /^tls_resumption_hosts =/;
     next if /^-tls_resumption/;
+    next if /^host_name_extract = /;
 
     # gsasl library version may not support some methods
     s/250-AUTH ANONYMOUS PLAIN SCRAM-SHA-1\K SCRAM-SHA-256//;
@@ -1248,7 +1249,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     # Skip tls_advertise_hosts and hosts_require_tls checks when the options
     # are unset, because tls ain't always there.
 
-    next if  /^(>>>)?\s*host in tls_advertise_hosts\?$/;
+    next if /^((>>>)?\s*host)? in tls_advertise_hosts\?$/;
     next if /in\s(?:tls_advertise_hosts\?|hosts_require_tls\?)
                 \sno\s\((option\sunset|end\sof\slist)\)/x;
 
@@ -1357,7 +1358,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if / in tls_advertise_requiretls?\? no \(end of list\)/;
 
     # Experimental_LIMITS
-    if ( /^(>>>)?\s*host in limits_advertise_hosts\?$/ )
+    if ( /^((>>>)?\s*host)? in limits_advertise_hosts\?$/ )
       {
       $_ = <IN>;
       while ( /^(>>>)?\s*list element: !\*$/ ) { $_ = <IN>; }
@@ -1368,6 +1369,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     # TCP Fast Open
     next if /^(ppppp )?setsockopt FASTOPEN: Network Error/;
 
+    # DISABLE_TLS_RESUME
+    next if /RE '.outlook.com/;
+
     # Environment cleaning
     next if /\w+ in keep_environment\? (yes|no)/;
 
diff --git a/test/stderr/0388 b/test/stderr/0388
index f3a48e5fc..276962f6b 100644
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -93,9 +93,6 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... 127.0.0.1 in hosts_try_fastopen?
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
   SMTP<< 250 OK
- compiled RE '.outlook.com$' not found in local cache
- compiling RE '.outlook.com$'
- compiled RE '.outlook.com$' saved in local cache
 127.0.0.1 in hosts_require_auth? no (option unset)
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
 cmd buf flush ddd bytes
diff --git a/test/stderr/0398 b/test/stderr/0398
index 8836a6d46..12727cfc4 100644
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -158,9 +158,6 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... 127.0.0.1 in hosts_try_fastopen?
   SMTP>> EHLO mail.test.ex
 cmd buf flush ddd bytes
   SMTP<< 250 OK
- compiled RE '.outlook.com$' not found in local cache
- compiling RE '.outlook.com$'
- compiled RE '.outlook.com$' saved in local cache
 not using PIPELINING
 not using DSN
 127.0.0.1 in hosts_require_auth? no (option unset)
diff --git a/test/stderr/0432 b/test/stderr/0432
index 06e40f039..917279c1e 100644
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -111,9 +111,6 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... 127.0.0.1 in hosts_try_fastopen?
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
   SMTP<< 250 OK
- compiled RE '.outlook.com$' not found in local cache
- compiling RE '.outlook.com$'
- compiled RE '.outlook.com$' saved in local cache
 not using PIPELINING
 not using DSN
 127.0.0.1 in hosts_require_auth? no (option unset)
diff --git a/test/stderr/0487 b/test/stderr/0487
index 88ce6aaca..86af4dfec 100644
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -19,15 +19,12 @@ LOG: smtp_connection MAIN
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< ehlo x.y
- in limits_advertise_hosts?
- list element: !*
  in dsn_advertise_hosts? no (option unset)
  in pipelining_advertise_hosts?
  list element: *
   in pipelining_advertise_hosts? yes (matched "*")
  in chunking_advertise_hosts?
  in chunking_advertise_hosts? no (end of list)
- in tls_advertise_hosts?
 SMTP>> 250-myhost.test.ex Hello CALLER at x.y
        250-SIZE 52428800
        250-8BITMIME
diff --git a/test/stdout/0572 b/test/stdout/0572
index 2aa0d9b2d..acfa5a0cd 100644
--- a/test/stdout/0572
+++ b/test/stdout/0572
@@ -48,7 +48,6 @@ fallback_hosts =
 final_timeout = 10m
 no_gethostbyname
 helo_data = $primary_hostname
-host_name_extract = ${if and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
 hosts = 
 hosts_avoid_esmtp = 
 hosts_avoid_pipelining =