summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2012-04-19 01:52:07 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2012-04-19 01:52:07 +0100
commit1bad4ba467f200ec1629bcd83cdaf76be5c1fe26 (patch)
tree463d5a7156ead40a84c07e62461314e9493b5294
parent44e6236daf6d9988dc66c1ce28b11fcc54d76a16 (diff)
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.
-rwxr-xr-xtest/runtest7
1 files changed, 5 insertions, 2 deletions
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