X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=test%2Fruntest;h=9effe3479eb86aa1f65d62bec9929af5248df8a8;hb=87abcb247b4444bab5fd0bcb212ddb26d5fd9191;hp=f565a5e5506fe3d1153d80ec4a43151180e987fc;hpb=766ac2f4801188c0762f49a24f159587abd24119;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/test/runtest b/test/runtest
index f565a5e55..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;
@@ -1218,7 +1221,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 & no-support
+	$/x)
       {
       $_ = $1 . " ... " . <IN>;
       s/^(.* \.\.\.) [0-9: ]*connected$/$1 connected/;