Testsuite: better non-TFO-system debug handling

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

diff --git a/test/runtest b/test/runtest
index 9effe3479eb86aa1f65d62bec9929af5248df8a8..8515e2f320135fac1edde8433513324efc31206c 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1215,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/;
       }
@@ -1263,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