From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 28 May 2019 22:38:34 +0000 (+0100)
Subject: Testsuite: platform variances
X-Git-Tag: exim-4.93-RC0~166
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f7598860019d4a0867ca37688461e16927cd7928;p=exim.git

Testsuite: platform variances
---

diff --git a/test/runtest b/test/runtest
index f565a5e55..1b6eaabb0 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/;