summaryrefslogtreecommitdiffstats
path: root/test/SConscript
diff options
context:
space:
mode:
authorMats Wichmann <mats@linux.com>2018-07-30 02:24:18 (GMT)
committerMats Wichmann <mats@linux.com>2018-07-30 02:24:18 (GMT)
commit44ed2ad161836d9d3f119fc6454c9e92a356c1e1 (patch)
treef4413e3f4552e21d7b1cc884c9d57e94bd2b960f /test/SConscript
parent6166782fe90fc96a866424958fd6a632c76318f6 (diff)
downloadSCons-44ed2ad161836d9d3f119fc6454c9e92a356c1e1.zip
SCons-44ed2ad161836d9d3f119fc6454c9e92a356c1e1.tar.gz
SCons-44ed2ad161836d9d3f119fc6454c9e92a356c1e1.tar.bz2
Some further adjustments to missing-sconscript tests
Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'test/SConscript')
-rw-r--r--test/SConscript/must_exist.py4
1 files changed, 2 insertions, 2 deletions
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)