X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/39e69de6d78795c93d5363f5c70240137194eb5e..0075b53360a9b1452bd5d11b9c0a6c254c42a465:/test/runtest diff --git a/test/runtest b/test/runtest index 6319f5b81..9f6569128 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. @@ -913,6 +917,11 @@ RESET_AFTER_EXTRA_LINE_READ: last if !defined $_; + # SRS timestamps and signatures vary by hostname and from run to run + + s/SRS0=....=..=[^=]+=[^@]+\@test.ex/SRS0=ZZZZ=YY=the.local.host.name=CALLER\@test.ex/; + + # ======== Output from the "fd" program about open descriptors ======== # The statuses seem to be different on different operating systems, but # at least we'll still be checking the number of open fd's.