Testsuite: account for platforms not supporting TFO

diff --git a/test/runtest b/test/runtest
index b601af6c78f57b8f30aa941c59b386d42539da90..afaaee3b21e01d54ade86c90a21cb1bd2faee161 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1045,6 +1045,14 @@ RESET_AFTER_EXTRA_LINE_READ:
     # Spool filesystem free space changes on different systems.
     s/^((?:spool|log) directory space =) -?\d+K (inodes =)\s*-?\d+/$1 nnnnnK $2 nnnnn/;
 
     # Spool filesystem free space changes on different systems.
     s/^((?:spool|log) directory space =) -?\d+K (inodes =)\s*-?\d+/$1 nnnnnK $2 nnnnn/;
 

+    # Not all platforms support TCP Fast Open, and the compile omits the check
+    if (/^((>>> )?Connecting to .* )in hosts_try_fastopen\? no \(option unset\)$/)
+      {
+      my $p = $1;
+      $_ = <IN>;
+      s/^/$p/;
+      }
+

     # When Exim is checking the size of directories for maildir, it uses
     # the check_dir_size() function to scan directories. Of course, the order
     # of the files that are obtained using readdir() varies from system to
     # When Exim is checking the size of directories for maildir, it uses
     # the check_dir_size() function to scan directories. Of course, the order
     # of the files that are obtained using readdir() varies from system to

diff --git a/test/stderr/0388 b/test/stderr/0388
index f8866380edc525b9d1849ccf1223dd4fd116f3ce..e5b3baa25938d758cea768bf02bfeaa7783cbc35 100644 (file)
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -81,8 +81,7 @@ returned from EXIM_DBOPEN
 no retry data available
 127.0.0.1 in serialize_hosts? no (option unset)
 set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (x@y)
 no retry data available
 127.0.0.1 in serialize_hosts? no (option unset)
 set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (x@y)

-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 127.0.0.1 in hosts_try_fastopen? no (option unset)
-connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 127.0.0.1 connected

   SMTP<< 220 Server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO myhost.test.ex
   SMTP<< 220 Server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO myhost.test.ex


@@ -113,8 +112,7 @@ returned from EXIM_DBOPEN
 no retry data available
 V4NET.0.0.0 in serialize_hosts? no (option unset)
 set_process_info: pppp delivering 10HmaX-0005vi-00 to V4NET.0.0.0 [V4NET.0.0.0] (x@y)
 no retry data available
 V4NET.0.0.0 in serialize_hosts? no (option unset)
 set_process_info: pppp delivering 10HmaX-0005vi-00 to V4NET.0.0.0 [V4NET.0.0.0] (x@y)

-Connecting to V4NET.0.0.0 [V4NET.0.0.0]:1224 ... V4NET.0.0.0 in hosts_try_fastopen? no (option unset)
-failed: Network Error
+Connecting to V4NET.0.0.0 [V4NET.0.0.0]:1224 ... V4NET.0.0.0 failed: Network is unreachable

 LOG: MAIN
   H=V4NET.0.0.0 [V4NET.0.0.0] Network Error
 set_process_info: pppp delivering 10HmaX-0005vi-00: just tried V4NET.0.0.0 [V4NET.0.0.0] for x@y: result DEFER
 LOG: MAIN
   H=V4NET.0.0.0 [V4NET.0.0.0] Network Error
 set_process_info: pppp delivering 10HmaX-0005vi-00: just tried V4NET.0.0.0 [V4NET.0.0.0] for x@y: result DEFER

diff --git a/test/stderr/0398 b/test/stderr/0398
index 1dcb998f70407d286f15976e530540a090bd0958..2cac34e90c1f65b87c0b45aea60f9977d9780609 100644 (file)
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -129,8 +129,7 @@ dbfn_read: key=qq@remote
 callout cache: no address record found for qq@remote
 closed hints database and lockfile
 interface=NULL port=1224
 callout cache: no address record found for qq@remote
 closed hints database and lockfile
 interface=NULL port=1224

-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 127.0.0.1 in hosts_try_fastopen? no (option unset)
-connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 127.0.0.1 connected

   SMTP<< 220 Server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO mail.test.ex
   SMTP<< 220 Server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO mail.test.ex

diff --git a/test/stderr/0432 b/test/stderr/0432
index 76111d5d7fb225f2fe8380fc2fe39e67ca228c5e..333d26cf6af16b42a99df0d19b2a69cb14d63505 100644 (file)
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -90,8 +90,7 @@ dbfn_read: key=x@y
 callout cache: no address record found for x@y
 closed hints database and lockfile
 interface=NULL port=1224
 callout cache: no address record found for x@y
 closed hints database and lockfile
 interface=NULL port=1224

-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 127.0.0.1 in hosts_try_fastopen? no (option unset)
-connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 127.0.0.1 connected

   SMTP<< 220 server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO myhost.test.ex
   SMTP<< 220 server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO myhost.test.ex

diff --git a/test/stderr/5410 b/test/stderr/5410
index e7323f58139de2fa000d49981a34e40a09251244..f96491248eee7aca982e9fd615d036bfa4bce7ee 100644 (file)
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -49,8 +49,7 @@ considering: $local_part
   expanding: $local_part
      result: userx
 domain.com in "*"? yes (matched "*")
   expanding: $local_part
      result: userx
 domain.com in "*"? yes (matched "*")

-Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 127.0.0.1 in hosts_try_fastopen? no (option unset)
-connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 127.0.0.1 connected

 considering: $primary_hostname
   expanding: $primary_hostname
      result: myhost.test.ex
 considering: $primary_hostname
   expanding: $primary_hostname
      result: myhost.test.ex


@@ -314,8 +313,7 @@ considering: $local_part
   expanding: $local_part
      result: usery
 domain.com in "*"? yes (matched "*")
   expanding: $local_part
      result: usery
 domain.com in "*"? yes (matched "*")

-Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 127.0.0.1 in hosts_try_fastopen? no (option unset)
-connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 127.0.0.1 connected

 considering: $primary_hostname
   expanding: $primary_hostname
      result: myhost.test.ex
 considering: $primary_hostname
   expanding: $primary_hostname
      result: myhost.test.ex


@@ -546,8 +544,7 @@ considering: $local_part
   expanding: $local_part
      result: usery
 domain.com in "*"? yes (matched "*")
   expanding: $local_part
      result: usery
 domain.com in "*"? yes (matched "*")

-Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 127.0.0.1 in hosts_try_fastopen? no (option unset)
-connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 127.0.0.1 connected

 considering: $primary_hostname
   expanding: $primary_hostname
      result: myhost.test.ex
 considering: $primary_hostname
   expanding: $primary_hostname
      result: myhost.test.ex

diff --git a/test/stderr/5420 b/test/stderr/5420
index 684629e68501f81fc985117d9724dc16cd48911f..a3c1400124396c2249524d9c9faf6b729c86e387 100644 (file)
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -49,8 +49,7 @@ considering: $local_part
   expanding: $local_part
      result: userx
 domain.com in "*"? yes (matched "*")
   expanding: $local_part
      result: userx
 domain.com in "*"? yes (matched "*")

-Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 127.0.0.1 in hosts_try_fastopen? no (option unset)
-connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 127.0.0.1 connected

 considering: $primary_hostname
   expanding: $primary_hostname
      result: myhost.test.ex
 considering: $primary_hostname
   expanding: $primary_hostname
      result: myhost.test.ex


@@ -313,8 +312,7 @@ considering: $local_part
   expanding: $local_part
      result: usery
 domain.com in "*"? yes (matched "*")
   expanding: $local_part
      result: usery
 domain.com in "*"? yes (matched "*")

-Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 127.0.0.1 in hosts_try_fastopen? no (option unset)
-connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 127.0.0.1 connected

 considering: $primary_hostname
   expanding: $primary_hostname
      result: myhost.test.ex
 considering: $primary_hostname
   expanding: $primary_hostname
      result: myhost.test.ex


@@ -545,8 +543,7 @@ considering: $local_part
   expanding: $local_part
      result: usery
 domain.com in "*"? yes (matched "*")
   expanding: $local_part
      result: usery
 domain.com in "*"? yes (matched "*")

-Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 127.0.0.1 in hosts_try_fastopen? no (option unset)
-connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 127.0.0.1 connected

 considering: $primary_hostname
   expanding: $primary_hostname
      result: myhost.test.ex
 considering: $primary_hostname
   expanding: $primary_hostname
      result: myhost.test.ex

diff --git a/test/stderr/5840 b/test/stderr/5840
index 29ca2804a3fa8cdfac23ee8ca04ab77012cf2ad9..082e073c8463c8d7b00891998daeb062f8f2c7f7 100644 (file)
--- a/test/stderr/5840
+++ b/test/stderr/5840
@@ -18,8 +18,7 @@
 >>> callout cache: no domain record found for dane256ee.test.ex
 >>> callout cache: no address record found for CALLER@dane256ee.test.ex
 >>> interface=NULL port=1225
 >>> callout cache: no domain record found for dane256ee.test.ex
 >>> callout cache: no address record found for CALLER@dane256ee.test.ex
 >>> interface=NULL port=1225

->>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:1225 ... ip4.ip4.ip4.ip4 in hosts_try_fastopen? no (option unset)
->>> connected
+>>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:1225 ... ip4.ip4.ip4.ip4 >>> connected

 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=thishost.test.ex address=127.0.0.1
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=thishost.test.ex address=127.0.0.1