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 ab87ab30e7df3a9da52b168c9a4bea35716a2df6..31aaaa902e83364e7cbb081e9da724915447c2ec 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -687,8 +687,11 @@ RESET_AFTER_EXTRA_LINE_READ:
   s/^\d\d\d(?=[PFS*])/ddd/;
 
 
   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
 
   # ==========================================================
   # Some munging is specific to the specific file types