From 44ed2ad161836d9d3f119fc6454c9e92a356c1e1 Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Sun, 29 Jul 2018 20:24:18 -0600 Subject: Some further adjustments to missing-sconscript tests Signed-off-by: Mats Wichmann --- src/engine/SCons/Script/SConscript.py | 4 ++-- test/SConscript/must_exist.py | 4 ++-- test/option-f.py | 9 ++++++--- test/option/warn-missing-sconscript.py | 11 +++++++++-- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py index 3b73010..1d83bb6 100644 --- a/src/engine/SCons/Script/SConscript.py +++ b/src/engine/SCons/Script/SConscript.py @@ -165,10 +165,10 @@ def handle_missing_SConscript(f, must_exist=None): raise SCons.Errors.UserError(msg) if SCons.Script._warn_missing_sconscript_deprecated: - msg = "Calling missing SConscripts without error is deprecated.\n" + \ + msg = "Calling missing SConscript without error is deprecated.\n" + \ "Transition by adding must_exist=0 to SConscript calls.\n" + \ "Missing SConscript '%s'" % f.get_internal_path() - SCons.Warnings.warn(SCons.Warnings.DeprecatedMissingSConscriptWarning, msg) + SCons.Warnings.warn(SCons.Warnings.MissingSConscriptWarning, msg) SCons.Script._warn_missing_sconscript_deprecated = False else: msg = "Ignoring missing SConscript '%s'" % f.get_internal_path() diff --git a/test/SConscript/must_exist.py b/test/SConscript/must_exist.py index a4341fa..ac90cd1 100644 --- a/test/SConscript/must_exist.py +++ b/test/SConscript/must_exist.py @@ -72,7 +72,7 @@ try: except SCons.Errors.UserError as e: if _warningOut: _warningOut(e) -# 6. must_exist=False should override system setting +# 6. must_exist=False overrides system setting, should emit warning try: SConscript('missing/SConscript', must_exist=False) except SCons.Errors.UserError as e: @@ -83,7 +83,7 @@ except SCons.Errors.UserError as e: # we should see two exceptions as "Fatal" and # and see four warnings, the first having the depr message warn1 = """ -scons: warning: Calling missing SConscripts without error is deprecated. +scons: warning: Calling missing SConscript without error is deprecated. Transition by adding must_exist=0 to SConscript calls. Missing SConscript 'missing/SConscript' """ + test.python_file_line(SConstruct_path, 7) diff --git a/test/option-f.py b/test/option-f.py index 21afacb..46e2686 100644 --- a/test/option-f.py +++ b/test/option-f.py @@ -97,9 +97,12 @@ test.run(arguments = '-f Build2 -f SConscript .', stdout=expect) test.run(arguments = '-f no_such_file .', stdout = test.wrap_stdout("scons: `.' is up to date.\n"), stderr = None) -test.fail_test(not test.match_re(test.stderr(), """ -scons: warning: Ignoring missing SConscript 'no_such_file' -""" + TestSCons.file_expr)) +expect = """ +scons: warning: Calling missing SConscript without error is deprecated. +Transition by adding must_exist=0 to SConscript calls. +Missing SConscript 'no_such_file'""" +stderr = test.stderr() +test.must_contain_all(test.stderr(), expect) test.pass_test() diff --git a/test/option/warn-missing-sconscript.py b/test/option/warn-missing-sconscript.py index 4f1f8bd..492131b 100644 --- a/test/option/warn-missing-sconscript.py +++ b/test/option/warn-missing-sconscript.py @@ -51,16 +51,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() -- cgit v0.12