diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2018-10-21 23:37:14 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2018-10-21 23:37:14 +0100 |
| commit | ca9be0dc61a92a34325d83d72601e47b10e38f09 (patch) | |
| tree | db384ef15298ae57376d14e04300bd6d6bf0900d | |
| parent | d7625a4d832fb661474dc89c656b05dc42397a83 (diff) | |
Testsuite: fix debug stream munging for non-autocreate DBM variants, and for no TFO support
| -rwxr-xr-x | test/runtest | 13 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0609 | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/test/runtest b/test/runtest index e5f2a0475..7c89f10b0 100755 --- 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 - # 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. @@ -1113,6 +1115,9 @@ RESET_AFTER_EXTRA_LINE_READ: # 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)/; diff --git a/test/scripts/0000-Basic/0609 b/test/scripts/0000-Basic/0609 index 84ab89ded..ea83bbfba 100644 --- 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 +# "delay cancelled by peer close" +# exim -d-all+acl -DSERVER=server -odq -bd -oX PORT_D **** # |