diff options
| author | William Deegan <bill@baddogconsulting.com> | 2018-10-09 20:23:51 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2018-10-09 20:23:51 (GMT) |
| commit | ade84bc59db524fbccd670bfadefa786407c7c0b (patch) | |
| tree | a3da7c7e0fa926ad41f01ae09ab709c660c67bd9 /test/option/warn-missing-sconscript.py | |
| parent | a1c6873e2f84240feab9a923ccc1ebcda3160339 (diff) | |
| parent | e342d031c2a80cc7eb27ca139b7adee2d37a8216 (diff) | |
| download | SCons-ade84bc59db524fbccd670bfadefa786407c7c0b.zip SCons-ade84bc59db524fbccd670bfadefa786407c7c0b.tar.gz SCons-ade84bc59db524fbccd670bfadefa786407c7c0b.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into subst_rewrite
Diffstat (limited to 'test/option/warn-missing-sconscript.py')
| -rw-r--r-- | test/option/warn-missing-sconscript.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/test/option/warn-missing-sconscript.py b/test/option/warn-missing-sconscript.py index 4f1f8bd..f5e697b 100644 --- a/test/option/warn-missing-sconscript.py +++ b/test/option/warn-missing-sconscript.py @@ -34,10 +34,11 @@ test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) test.write("SConstruct", """\ +DefaultEnvironment(tools=[]) def build(target, source, env): pass -env=Environment() +env=Environment(tools=[]) env['BUILDERS']['test'] = Builder(action=build) env.test(target='foo', source='foo.c') WARN = ARGUMENTS.get('WARN') @@ -51,16 +52,23 @@ test.write("foo.c",""" """) expect = r""" -scons: warning: Ignoring missing SConscript 'no_such_file' +scons: warning: Calling missing SConscript without error is deprecated. +Transition by adding must_exist=0 to SConscript calls. +Missing SConscript 'no_such_file' """ + TestSCons.file_expr +# this is the old message: +#expect = r""" +#scons: warning: Ignoring missing SConscript 'no_such_file' +"" + TestSCons.file_expr + test.run(arguments = '--warn=missing-sconscript .', stderr = expect) test.run(arguments = '--warn=no-missing-sconscript .', stderr = "") test.run(arguments = 'WARN=missing-sconscript .', stderr = expect) -test.run(arguments = 'WARN=no-missing-sconscript .') +test.run(arguments = 'WARN=no-missing-sconscript .', stderr = "") test.pass_test() |