From 0654a72eb779d329421fde4fad7ee411c70f9e0d Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Mon, 7 Aug 2023 09:01:52 -0600 Subject: missing-sconscript: fix Windows test again Also dropped the word Fatal from the error, it's not consistent with any other scons-generated exception. Signed-off-by: Mats Wichmann --- SCons/Script/SConscript.py | 2 +- test/SConscript/must_exist.py | 10 +++++----- test/option/option-f.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/SCons/Script/SConscript.py b/SCons/Script/SConscript.py index 28a3773..2a36a6f 100644 --- a/SCons/Script/SConscript.py +++ b/SCons/Script/SConscript.py @@ -168,7 +168,7 @@ def handle_missing_SConscript(f: str, must_exist: bool = True) -> None: return if not SCons.Script._no_missing_sconscript: # system default changed: ok return - msg = f"Fatal: missing SConscript '{f.get_internal_path()}'" + msg = f"missing SConscript file {f.get_internal_path()!r}" raise SCons.Errors.UserError(msg) diff --git a/test/SConscript/must_exist.py b/test/SConscript/must_exist.py index 85b2438..90f447e 100644 --- a/test/SConscript/must_exist.py +++ b/test/SConscript/must_exist.py @@ -90,31 +90,31 @@ except UserError as e: missing = os.path.join("missing", "SConscript") err1 = f""" -scons: *** Fatal: missing SConscript {missing!r} +scons: *** missing SConscript file {missing!r} """ + test.python_file_line( SConstruct_path, 21 ) err2 = f""" -scons: *** Fatal: missing SConscript {missing!r} +scons: *** missing SConscript file {missing!r} """ + test.python_file_line( SConstruct_path, 27 ) err3 = f""" -scons: *** Fatal: missing SConscript {missing!r} +scons: *** missing SConscript file {missing!r} """ + test.python_file_line( SConstruct_path, 33 ) err4 = f""" -scons: *** Fatal: missing SConscript {missing!r} +scons: *** missing SConscript file {missing!r} """ + test.python_file_line( SConstruct_path, 40 ) err5 = f""" -scons: *** Fatal: missing SConscript {missing!r} +scons: *** missing SConscript file {missing!r} """ + test.python_file_line( SConstruct_path, 46 ) diff --git a/test/option/option-f.py b/test/option/option-f.py index 14a7ecc..a2c8561 100644 --- a/test/option/option-f.py +++ b/test/option/option-f.py @@ -141,7 +141,7 @@ test.run(arguments='-f Build2 -f SConscript .', stdout=expect) missing = "no_such_file" test.run(arguments=f"-f {missing} .", status=2, stderr=None) -expect = [f"scons: *** Fatal: missing SConscript {missing!r}"] +expect = [f"scons: *** missing SConscript file {missing!r}"] test.must_contain_all_lines(test.stderr(), expect) test.pass_test() -- cgit v0.12