summaryrefslogtreecommitdiffstats
path: root/test/Repository
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2004-07-13 08:06:06 (GMT)
committerSteven Knight <knight@baldmt.com>2004-07-13 08:06:06 (GMT)
commitd4da437a7df193b540560e8bb06aa1573b615cc8 (patch)
tree00389ded72bf2cd3148311e7fddf8466bc535bcd /test/Repository
parent6dfe1bb16b84e5ce1f845bf3d1c83c2b34f65129 (diff)
downloadSCons-d4da437a7df193b540560e8bb06aa1573b615cc8.zip
SCons-d4da437a7df193b540560e8bb06aa1573b615cc8.tar.gz
SCons-d4da437a7df193b540560e8bb06aa1573b615cc8.tar.bz2
Fix tests on systems where 'ar' prints warnings about creating archives. (Kevin Quick)
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 00c5eb5..2dd8f88 100644
--- a/test/Repository/StaticLibrary.py
+++ b/test/Repository/StaticLibrary.py
@@ -37,7 +37,7 @@ else:
-test = TestSCons.TestSCons()
+test = TestSCons.TestSCons(match=TestSCons.match_re_dotall)
#
test.subdir('repository', 'work1', 'work2', 'work3')
@@ -100,7 +100,8 @@ main(int argc, char *argv[])
test.writable('repository', 0)
#
-test.run(chdir = 'work1', options = opts, arguments = ".")
+test.run(chdir = 'work1', options = opts, arguments = ".",
+ stderr=TestSCons.noisy_ar)
test.run(program = work1_foo, stdout =
"""repository/aaa.c
@@ -123,7 +124,8 @@ bbb(void)
}
""")
-test.run(chdir = 'work1', options = opts, arguments = ".")
+test.run(chdir = 'work1', options = opts, arguments = ".",
+ stderr=TestSCons.noisy_ar)
test.run(program = work1_foo, stdout =
"""repository/aaa.c
@@ -141,7 +143,8 @@ test.up_to_date(chdir = 'work1', options = opts, arguments = ".")
#
test.writable('repository', 1)
-test.run(chdir = 'repository', options = opts, arguments = ".")
+test.run(chdir = 'repository', options = opts, arguments = ".",
+ stderr=TestSCons.noisy_ar)
test.run(program = repository_foo, stdout =
"""repository/aaa.c
@@ -169,7 +172,8 @@ bbb(void)
}
""")
-test.run(chdir = 'work2', options = opts, arguments = ".")
+test.run(chdir = 'work2', options = opts, arguments = ".",
+ stderr=TestSCons.noisy_ar)
test.run(program = work2_foo, stdout =
"""repository/aaa.c