From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Thu, 19 Apr 2012 00:52:07 +0000 (+0100)
Subject: Bug 1224 followon - avoid breaking other testcases.
X-Git-Tag: exim-4_80_RC1~66
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1bad4ba467f200ec1629bcd83cdaf76be5c1fe26;p=exim.git

Bug 1224 followon - avoid breaking other testcases.

Add specific patterns to avoid when munging the output.
This is fragile and may still be broken outside my specific test environment.
---

diff --git a/test/runtest b/test/runtest
index ab87ab30e..31aaaa902 100755
--- a/test/runtest
+++ b/test/runtest
@@ -687,8 +687,11 @@ RESET_AFTER_EXTRA_LINE_READ:
   s/^\d\d\d(?=[PFS*])/ddd/;
 
 
-  # Lookups have a char which depends on the number of lookup types compiled in.
-  s%(?<!lsearch)[0-?]TESTSUITE/aux-fixed/%0TESTSUITE/aux-fixed/%g;
+  # ========= Exim lookups ==================
+  # Lookups have a char which depends on the number of lookup types compiled in,
+  # in stderr output.  Replace with a "0".  Recognising this while avoiding
+  # other output is fragile; perhaps the debug output should be revised instead.
+  s%(?<!sqlite)(?<!lsearch\*@)(?<!lsearch\*)(?<!lsearch)[0-?]TESTSUITE/aux-fixed/%0TESTSUITE/aux-fixed/%g;
 
   # ==========================================================
   # Some munging is specific to the specific file types