Testsuite: fix debug stream munging for non-autocreate DBM variants, and for no TFO...

diff --git a/test/runtest b/test/runtest
index e5f2a04759d374b76a8f5c4fa8dc30161a963c13..7c89f10b0bc52fa97e832c39e233111fade9d74b 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1075,12 +1075,14 @@ RESET_AFTER_EXTRA_LINE_READ:
     # Some DBM libraries seem to make DBM files on opening with O_RDWR without
     # O_CREAT; other's don't. In the latter case there is some debugging output
     # which is not present in the former. Skip the relevant lines (there are
     # Some DBM libraries seem to make DBM files on opening with O_RDWR without
     # O_CREAT; other's don't. In the latter case there is some debugging output
     # which is not present in the former. Skip the relevant lines (there are

-    # two of them).
+    # three of them).

 
 

-    if (/TESTSUITE\/spool\/db\/\S+ appears not to exist: trying to create/)
+    if (/returned from EXIM_DBOPEN: \(nil\)/)

       {
       {

-      $_ = <IN>;
-      next;
+      $_ .= <IN>;
+      s?\Q$parm_cwd\E?TESTSUITE?g;
+      if (/TESTSUITE\/spool\/db\/\S+ appears not to exist: trying to create/)
+       { $_ = <IN>; next; }

       }
 
     # Some tests turn on +expand debugging to check on expansions.
       }
 
     # Some tests turn on +expand debugging to check on expansions.


@@ -1113,6 +1115,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     # Experimental_REQUIRETLS
     next if / in tls_advertise_requiretls?\? no \(end of list\)/;
 
     # Experimental_REQUIRETLS
     next if / in tls_advertise_requiretls?\? no \(end of list\)/;
 

+    # TCP Fast Open
+    next if /^setsockopt FASTOPEN: Network Error/;
+

     # Environment cleaning
     next if /\w+ in keep_environment\? (yes|no)/;
 
     # Environment cleaning
     next if /\w+ in keep_environment\? (yes|no)/;
 

diff --git a/test/scripts/0000-Basic/0609 b/test/scripts/0000-Basic/0609
index 84ab89deddf1531acb6b00250b761bfcc7a17c14..ea83bbfbab4e779b2fd1986c029d478821dec944 100644 (file)
--- a/test/scripts/0000-Basic/0609
+++ b/test/scripts/0000-Basic/0609
@@ -3,6 +3,8 @@ munge debug_pid
 need_ipv4
 #
 # We want the debug note of a truncated delay
 need_ipv4
 #
 # We want the debug note of a truncated delay

+# "delay cancelled by peer close"
+#

 exim -d-all+acl -DSERVER=server -odq -bd -oX PORT_D
 ****
 #
 exim -d-all+acl -DSERVER=server -odq -bd -oX PORT_D
 ****
 #