Testsuite: platform variances

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index 33caf204ef4d40e69cf75954b13856271694a3ac..1b6eaabb002f66dfefd4e17d8131fcdcb29d255c 100755 (executable)
--- 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/;
@@ -1330,6 +1335,8 @@ RESET_AFTER_EXTRA_LINE_READ:
       else
        { $_ = $prev; }
       }
+    # translate gnutls error into the openssl one
+    s/ARC: AMS signing: privkey PEM-block import: \KThe requested data were not available.$/error:0906D06C:PEM routines:PEM_read_bio:no start line/;
 
     # DKIM timestamps
     if ( /(DKIM: d=.*) t=([0-9]*) x=([0-9]*) / )