summaryrefslogtreecommitdiffstats
path: root/test/Repository
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2004-07-15 12:39:34 (GMT)
committerSteven Knight <knight@baldmt.com>2004-07-15 12:39:34 (GMT)
commitaf9e270bf0dc34fecff450199f90dc14bb0334de (patch)
treec2864cbd6341ba776c90abb8c2cbb1456906a0a5 /test/Repository
parentd4da437a7df193b540560e8bb06aa1573b615cc8 (diff)
downloadSCons-af9e270bf0dc34fecff450199f90dc14bb0334de.zip
SCons-af9e270bf0dc34fecff450199f90dc14bb0334de.tar.gz
SCons-af9e270bf0dc34fecff450199f90dc14bb0334de.tar.bz2
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.
Diffstat (limited to 'test/Repository')
-rw-r--r--test/Repository/StaticLibrary.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/test/Repository/StaticLibrary.py b/test/Repository/StaticLibrary.py
index 2dd8f88..f104448 100644
--- a/test/Repository/StaticLibrary.py
+++ b/test/Repository/StaticLibrary.py
@@ -37,7 +37,7 @@ else:
-test = TestSCons.TestSCons(match=TestSCons.match_re_dotall)
+test = TestSCons.TestSCons()
#
test.subdir('repository', 'work1', 'work2', 'work3')
@@ -101,7 +101,8 @@ test.writable('repository', 0)
#
test.run(chdir = 'work1', options = opts, arguments = ".",
- stderr=TestSCons.noisy_ar)
+ stderr=TestSCons.noisy_ar,
+ match=TestSCons.match_re_dotall)
test.run(program = work1_foo, stdout =
"""repository/aaa.c
@@ -125,7 +126,8 @@ bbb(void)
""")
test.run(chdir = 'work1', options = opts, arguments = ".",
- stderr=TestSCons.noisy_ar)
+ stderr=TestSCons.noisy_ar,
+ match=TestSCons.match_re_dotall)
test.run(program = work1_foo, stdout =
"""repository/aaa.c
@@ -144,7 +146,8 @@ test.up_to_date(chdir = 'work1', options = opts, arguments = ".")
test.writable('repository', 1)
test.run(chdir = 'repository', options = opts, arguments = ".",
- stderr=TestSCons.noisy_ar)
+ stderr=TestSCons.noisy_ar,
+ match=TestSCons.match_re_dotall)
test.run(program = repository_foo, stdout =
"""repository/aaa.c
@@ -173,7 +176,8 @@ bbb(void)
""")
test.run(chdir = 'work2', options = opts, arguments = ".",
- stderr=TestSCons.noisy_ar)
+ stderr=TestSCons.noisy_ar,
+ match=TestSCons.match_re_dotall)
test.run(program = work2_foo, stdout =
"""repository/aaa.c