From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sat, 29 Oct 2016 14:22:23 +0000 (+0100)
Subject: Testsuite: tidying
X-Git-Tag: exim-4_88_RC4~29
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8170f6f76062e136a942eafd6568917fa31d0955;p=exim.git

Testsuite: tidying
---

diff --git a/test/runtest b/test/runtest
index 5cfe1906d..96867ff3a 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1049,7 +1049,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     if (s/( \{with \$received_protocol)}\} \$\{if def:tls_cipher \{\(\$tls_cipher\)\n$/$1/)
       {
       $_ .= <IN>;
-      s/\t(\}\}\{Exim)/$1/;
+      s/\s+(?=\}\}\{Exim)//;
       }
 
     # Not all platforms support TCP Fast Open, and the compile omits the check
@@ -1059,7 +1059,7 @@ RESET_AFTER_EXTRA_LINE_READ:
       s/ \.\.\. >>> / ... /;
       }
 
-    next if /^setsockopt FASTOPEN: Protocol not available$/;
+    next if /^(ppppp )?setsockopt FASTOPEN: Protocol not available$/;
 
     # When Exim is checking the size of directories for maildir, it uses
     # the check_dir_size() function to scan directories. Of course, the order