Testsuite: platform variances
authorJeremy Harris <jgh146exb@wizmail.org>
Tue, 28 May 2019 22:38:34 +0000 (23:38 +0100)
committerJeremy Harris <jgh146exb@wizmail.org>
Tue, 28 May 2019 22:38:34 +0000 (23:38 +0100)
test/runtest

index f565a5e5506fe3d1153d80ec4a43151180e987fc..1b6eaabb002f66dfefd4e17d8131fcdcb29d255c 100755 (executable)
@@ -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/;