summaryrefslogtreecommitdiff
path: root/test/overrides.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2004-04-07 00:58:04 +0000
committerSteven Knight <knight@baldmt.com>2004-04-07 00:58:04 +0000
commit18904c3a781f097ca6f8b3ad06ff6ce991ad2640 (patch)
treecf95a3315adc04a859cd2127c3d76fa9359b5372 /test/overrides.py
parentce5403ae95d90fa06a507b1878206a312b125edb (diff)
downloadscons-18904c3a781f097ca6f8b3ad06ff6ce991ad2640.tar.gz
Make the targets/sources warnings test pass regardless of dictionary order.
Diffstat (limited to 'test/overrides.py')
-rw-r--r--test/overrides.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/overrides.py b/test/overrides.py
index eb43cedd..fa76b566 100644
--- a/test/overrides.py
+++ b/test/overrides.py
@@ -115,14 +115,14 @@ test.write('mylink.py',"""
open('goodbye.not_exe', 'wt').write('this is not a program!')
""")
-test.run(arguments='goodbye.not_exe', stderr="""\
-
-scons: warning: Did you mean to use `target' instead of `targets'?
-File "SConstruct", line 8, in ?
-
-scons: warning: Did you mean to use `source' instead of `sources'?
-File "SConstruct", line 8, in ?
-""")
+test.run(arguments='goodbye.not_exe', stderr=None)
+test.fail_test(not test.match_re(test.stderr(), r"""
+scons: warning: Did you mean to use `(target|source)' instead of `(targets|sources)'\?
+File "SConstruct", line \d+, in .+
+
+scons: warning: Did you mean to use `(target|source)' instead of `(targets|sources)'\?
+File "SConstruct", line \d+, in .+
+"""))
assert test.read('goodbye.not_obj') == 'this is no object file!'
assert test.read('goodbye.not_exe') == 'this is not a program!'