From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 22 Oct 2019 12:24:47 +0000 (+0100)
Subject: Testsuite: munge for WITH_LOCAL_SCAN
X-Git-Tag: exim-4.93-RC1~14
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e9da179430937b68fbbb080187eb64607b894743;p=exim.git

Testsuite: munge for WITH_LOCAL_SCAN
---

diff --git a/test/runtest b/test/runtest
index 3ecccb0b2..0d6bcd1d7 100755
--- a/test/runtest
+++ b/test/runtest
@@ -758,6 +758,10 @@ RESET_AFTER_EXTRA_LINE_READ:
   s/waiting for children of \d+/waiting for children of pppp/;
   s/waiting for (\S+) \(\d+\)/waiting for $1 (pppp)/;
 
+  # Most builds are without HAVE_LOCAL_SCAN
+  next if /^calling local_scan\(\); timeout=300$/;
+  next if /^local_scan\(\) returned 0 NULL$/;
+
   # ======== Port numbers ========
   # Incoming port numbers may vary, but not in daemon startup line.
 
@@ -1286,10 +1290,6 @@ RESET_AFTER_EXTRA_LINE_READ:
     # TLS resumption is not always supported by the build
     next if /in tls_resumption_hosts\?/;
 
-    # Most builds are without HAVE_LOCAL_SCAN
-    next if /^calling local_scan\(\); timeout=300$/;
-    next if /^local_scan\(\) returned 0 NULL$/;
-
     # Platform differences in errno strings
     s/  SMTP\(Operation timed out\)<</  SMTP(Connection timed out)<</;