Win32 portability: add an explicit match argument to TestCommon.py, use it to only use match_re_dotall when we're using TestSCons.noisy_ar.

1 files changed, 13 insertions, 5 deletions

diff --git a/test/LIBPATH.py b/test/LIBPATH.py
index 9f5bbfd..b9318a0 100644
--- a/test/LIBPATH.py
+++ b/test/LIBPATH.py
@@ -33,7 +33,7 @@ _exe = TestSCons._exe
 _dll = TestSCons._dll
 dll_ = TestSCons.dll_
     
-test = TestSCons.TestSCons(match=TestSCons.match_re_dotall)
+test = TestSCons.TestSCons()
 
 test.subdir('lib1', 'lib2')
 
@@ -86,7 +86,9 @@ main(int argc, char *argv[])
 }
 """)
 
-test.run(arguments = '.', stderr=TestSCons.noisy_ar)
+test.run(arguments = '.',
+         stderr=TestSCons.noisy_ar,
+         match=TestSCons.match_re_dotall)
 
 test.run(program = prog1,
          stdout = "f1.c\nprog.c\n")
@@ -107,7 +109,9 @@ f1(void)
 }
 """)
 
-test.run(arguments = '.', stderr=TestSCons.noisy_ar)
+test.run(arguments = '.',
+         stderr=TestSCons.noisy_ar,
+         match=TestSCons.match_re_dotall)
 test.run(program = prog1,
          stdout = "f1.c 1\nprog.c\n")
 test.fail_test(oldtime2 == os.path.getmtime(prog2))
@@ -138,7 +142,9 @@ f1(void)
 }
 """)
 
-test.run(arguments = '.', stderr=TestSCons.noisy_ar)
+test.run(arguments = '.',
+         stderr=TestSCons.noisy_ar,
+         match=TestSCons.match_re_dotall)
 test.run(program = prog1,
          stdout = "f1.c 2\nprog.c\n")
 
@@ -154,6 +160,8 @@ env = Environment(LIBPATH = '')
 env.Library('foo', source = 'empty.c')
 """)
 
-test.run(arguments = '.', stderr=TestSCons.noisy_ar)
+test.run(arguments = '.',
+         stderr=TestSCons.noisy_ar,
+         match=TestSCons.match_re_dotall)
 
 test.pass_test()