diff options
| author | Steven Knight <knight@baldmt.com> | 2004-04-07 00:58:04 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-04-07 00:58:04 (GMT) |
| commit | 18904c3a781f097ca6f8b3ad06ff6ce991ad2640 (patch) | |
| tree | cf95a3315adc04a859cd2127c3d76fa9359b5372 /test | |
| parent | ce5403ae95d90fa06a507b1878206a312b125edb (diff) | |
| download | SCons-18904c3a781f097ca6f8b3ad06ff6ce991ad2640.zip SCons-18904c3a781f097ca6f8b3ad06ff6ce991ad2640.tar.gz SCons-18904c3a781f097ca6f8b3ad06ff6ce991ad2640.tar.bz2 | |
Make the targets/sources warnings test pass regardless of dictionary order.
Diffstat (limited to 'test')
| -rw-r--r-- | test/option--warn.py | 8 | ||||
| -rw-r--r-- | test/overrides.py | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/test/option--warn.py b/test/option--warn.py index 0bf9a7e..41a37e1 100644 --- 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 eb43ced..fa76b56 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!' |