summaryrefslogtreecommitdiffstats
path: root/test/option
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/option
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/option')
-rw-r--r--test/option/warn-missing-sconscript.py11
1 files changed, 9 insertions, 2 deletions
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()