Testsuite: better non-TFO-system debug handling

[users/heiko/exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index 1b6eaabb002f66dfefd4e17d8131fcdcb29d255c..8515e2f320135fac1edde8433513324efc31206c 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1154,6 +1154,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     # remote port numbers vary
     s/(Connection request from 127.0.0.1 port) \d{1,5}/$1 sssss/;
 
+    # Platform-dependent error strings
+    s/Operation timed out/Connection timed out/;
+
     # Skip hosts_require_dane checks when the options
     # are unset, because dane ain't always there.
     next if /in\shosts_require_dane\?\sno\s\(option\sunset\)/x;
@@ -1212,6 +1215,7 @@ RESET_AFTER_EXTRA_LINE_READ:
       {
       $_ .= <IN>;
       s/ \.\.\. >>> / ... /;
+      if (s/ non-TFO mode connection attempt to 224.0.0.0, 0 data\b$//) { $_ .= <IN>; }
       s/Address family not supported by protocol family/Network Error/;
       s/Network is unreachable/Network Error/;
       }
@@ -1222,7 +1226,7 @@ RESET_AFTER_EXTRA_LINE_READ:
        Connecting\ to\ [^ ]+\ [^ ]+(\ from\ [^ ]+)?)\ \.\.\.
        \ .*TFO\ mode\ 
        (sendto,\ no\ data:\ EINPROGRESS                        # Linux
-       |connection\ attempt\ to\ [^,]+,\ 0\ data)              # MacOS
+       |connection\ attempt\ to\ [^,]+,\ 0\ data)              # MacOS & no-support
        $/x)
       {
       $_ = $1 . " ... " . <IN>;
@@ -1260,6 +1264,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     # TLS resumption is not always supported by the build
     next if /in tls_resumption_hosts\?/;
 
+    # Platform differences in errno strings
+    s/  SMTP\(Operation timed out\)<</  SMTP(Connection timed out)<</;
+
     # 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