[exim-cvs] Testsuite: munge for WITH_LOCAL_SCAN

Gitweb: https://git.exim.org/exim.git/commitdiff/0075b53360a9b1452bd5d11b9c0a6c254c42a465

Commit:     0075b53360a9b1452bd5d11b9c0a6c254c42a465
Parent:     a43b19ef3a58c547f76f42da0128dd33c7b51a4e
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Tue Oct 22 13:24:47 2019 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Wed Oct 23 09:53:08 2019 +0100

    Testsuite: munge for WITH_LOCAL_SCAN
---
 test/runtest | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/runtest b/test/runtest
index df73c49..9f65691 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.

@@ -1280,10 +1284,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)<</;