From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Wed, 29 May 2019 13:14:24 +0000 (+0100)
Subject: Testsuite: platform variances
X-Git-Tag: exim-4.93-RC0~165
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/ceaa36bf3127709e7c31393b8043eaec058d096c

Testsuite: platform variances
---

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