Make the targets/sources warnings test pass regardless of dictionary order.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@950 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/test/option--warn.py b/test/option--warn.py
index 0bf9a7e3d502ff523380e994d95f93a94e7daebc..41a37e1aeead301e405cfe4e3679eabf033041a4 100644 (file)
--- a/test/option--warn.py
+++ b/test/option--warn.py
@@ -158,10 +158,10 @@ test.write('file3b.out', 'file3b.out\n')
 
 test.run(arguments='.', 
          stderr=r"""
-scons: warning: Did you mean to use `target' instead of `targets'\?
+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 `source' instead of `sources'\?
+scons: warning: Did you mean to use `(target|source)' instead of `(targets|sources)'\?
 File "SConstruct", line \d+, in .+
 """)
 
@@ -170,10 +170,10 @@ test.must_match(['file3b'], 'file3b.out\n')
 
 test.run(arguments='--warn=misleading-keywords .', 
          stderr=r"""
-scons: warning: Did you mean to use `target' instead of `targets'\?
+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 `source' instead of `sources'\?
+scons: warning: Did you mean to use `(target|source)' instead of `(targets|sources)'\?
 File "SConstruct", line \d+, in .+
 """)
 

diff --git a/test/overrides.py b/test/overrides.py
index eb43ceddddc99a332ab5fb6f4b817589ecffe214..fa76b5663e6a4e6bb1a070054a2023691d07117f 100644 (file)
--- 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!'