[exim-cvs] Testsuite: platform variances

Top Page
Delete this message
Reply to this message
Author: Exim Git Commits Mailing List
Date:  
To: exim-cvs
Subject: [exim-cvs] Testsuite: platform variances
Gitweb: https://git.exim.org/exim.git/commitdiff/ceaa36bf3127709e7c31393b8043eaec058d096c
Commit:     ceaa36bf3127709e7c31393b8043eaec058d096c
Parent:     f7598860019d4a0867ca37688461e16927cd7928
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Wed May 29 14:14:24 2019 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Wed May 29 14:14:24 2019 +0100


    Testsuite: platform variances
---
 test/runtest | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


diff --git a/test/runtest b/test/runtest
index 1b6eaab..9effe34 100755
--- 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;
@@ -1222,7 +1225,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>;