summaryrefslogtreecommitdiffstats
path: root/test/SharedLibrary.py
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/SharedLibrary.py
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/SharedLibrary.py')
-rw-r--r--test/SharedLibrary.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/SharedLibrary.py b/test/SharedLibrary.py
index 6ad278d..d4eb730 100644
--- a/test/SharedLibrary.py
+++ b/test/SharedLibrary.py
@@ -31,7 +31,7 @@ import sys
import TestCmd
import TestSCons
-test = TestSCons.TestSCons(match=TestCmd.match_re)
+test = TestSCons.TestSCons(match=TestCmd.match_re_dotall)
test.write('SConstruct', """
import sys
@@ -191,7 +191,7 @@ main(int argc, char *argv[])
}
""")
-test.run(arguments = '.')
+test.run(arguments = '.', stderr=TestSCons.noisy_ar)
if os.name == 'posix':
os.environ['LD_LIBRARY_PATH'] = '.'
@@ -213,7 +213,7 @@ scons: \*\*\* Source file: foo\..* is static and is not compatible with shared t
scons: \*\*\* Source file: foo\..* is static and is not compatible with shared target: .*
''')
-test.run(arguments = '-f SConstructFoo2')
+test.run(arguments = '-f SConstructFoo2', stderr=TestSCons.noisy_ar)
if sys.platform == 'win32':
# Make sure we don't insert a .def source file (when