[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/f7598860019d4a0867ca37688461e16927cd7928
Commit:     f7598860019d4a0867ca37688461e16927cd7928
Parent:     766ac2f4801188c0762f49a24f159587abd24119
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Tue May 28 23:38:34 2019 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Tue May 28 23:38:34 2019 +0100


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


diff --git a/test/runtest b/test/runtest
index f565a5e..1b6eaab 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1218,7 +1218,12 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /^(ppppp )?setsockopt FASTOPEN: Protocol not available$/;
     s/^(Connecting to .* \.\.\. sending) \d+ (nonTFO early-data)$/$1 dd $2/;


-    if (/^([0-9: ]*Connecting to [^ ]+ [^ ]+( from [^ ]+)?) \.\.\. .*TFO mode sendto, no data: EINPROGRESS$/)
+    if (/^([0-9: ]*                        # possible timestamp
+    Connecting\ to\ [^ ]+\ [^ ]+(\ from\ [^ ]+)?)\ \.\.\.
+    \ .*TFO\ mode\ 
+    (sendto,\ no\ data:\ EINPROGRESS            # Linux
+    |connection\ attempt\ to\ [^,]+,\ 0\ data)        # MacOS
+    $/x)
       {
       $_ = $1 . " ... " . <IN>;
       s/^(.* \.\.\.) [0-9: ]*connected$/$1 connected/;