Testsuite: account for platforms not supporting TFO, redux

diff --git a/test/runtest b/test/runtest
index afaaee3b21e01d54ade86c90a21cb1bd2faee161..5360b3303c36d21941459b58a5e66c4ef7fc998c 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1046,11 +1046,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     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
     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\)$/)
+    if (s/\S+ in hosts_try_fastopen\? no \(option unset\)\n$//)

       {
       {

-      my $p = $1;
-      $_ = <IN>;
-      s/^/$p/;
+      $_ .= <IN>

       }
 
     # When Exim is checking the size of directories for maildir, it uses
       }
 
     # When Exim is checking the size of directories for maildir, it uses

diff --git a/test/stderr/0388 b/test/stderr/0388
index e5b3baa25938d758cea768bf02bfeaa7783cbc35..399edd821cf31ae14b6c20ff64f74b6346bac081 100644 (file)
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -81,7 +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 connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 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


@@ -112,7 +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 failed: Network is unreachable
+Connecting to V4NET.0.0.0 [V4NET.0.0.0]:1224 ... 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 2cac34e90c1f65b87c0b45aea60f9977d9780609..3e3994b99aec07a13936a9a73a1b71a3c53a58b1 100644 (file)
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -129,7 +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 connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 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 2abb55cc128e0b1e3c7381dfa1a81add7e3e33f7..885d62f0e54672e9af1ce25bb570e4e09007a778 100644 (file)
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -90,7 +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 connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 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


@@ -255,7 +255,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> callout cache: no domain record found for b
 >>> callout cache: no address record found for a@b
 >>> interface=NULL port=1224
 >>> callout cache: no domain record found for b
 >>> callout cache: no address record found for a@b
 >>> interface=NULL port=1224

->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 127.0.0.1 >>> connected
+>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... >>> 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


@@ -300,7 +300,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> callout cache: no domain record found for q
 >>> callout cache: no address record found for p1@q
 >>> interface=NULL port=1224
 >>> callout cache: no domain record found for q
 >>> callout cache: no address record found for p1@q
 >>> interface=NULL port=1224

->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 127.0.0.1 >>> connected
+>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... >>> 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/5403 b/test/stderr/5403
index a4104fe3cb557b9f392c7f240cc0a3f1395b9cbe..3c09ea6054bfd46ffebd49f802714ac8723ff067 100644 (file)
--- a/test/stderr/5403
+++ b/test/stderr/5403
@@ -69,7 +69,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> Attempting full verification using callout
 >>> callout cache: disabled by no_cache
 >>> interface=ip4.ip4.ip4.ip4 port=1224
 >>> Attempting full verification using callout
 >>> callout cache: disabled by no_cache
 >>> interface=ip4.ip4.ip4.ip4 port=1224

->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... 127.0.0.1 >>> connected
+>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... >>> 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 f96491248eee7aca982e9fd615d036bfa4bce7ee..7916518b706642a9045d3890c20c7d69617c89b2 100644 (file)
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -49,7 +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 connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected

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


@@ -313,7 +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 connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected

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


@@ -544,7 +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 connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 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 a3c1400124396c2249524d9c9faf6b729c86e387..a124515756bd94adf49eb2d67273adf30b554311 100644 (file)
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -49,7 +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 connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected

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


@@ -312,7 +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 connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected

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


@@ -543,7 +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 connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... 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 082e073c8463c8d7b00891998daeb062f8f2c7f7..556a26bb5ac20ad4fd97f6e79cef51335132701f 100644 (file)
--- a/test/stderr/5840
+++ b/test/stderr/5840
@@ -18,7 +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 >>> connected
+>>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:1225 ... >>> 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