From 7668569d8c503676a49e666d5877f9c7498888ee Mon Sep 17 00:00:00 2001 From: StenGruener <69786685+StenGruener@users.noreply.github.com> Date: Wed, 29 Nov 2023 20:14:38 +0000 Subject: [PATCH] adding unit tests to the fix --- CHANGES.txt | 3 +++ test/option/debug-sconscript.py | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index a55cb8f5fc..46d0abb03d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,6 +8,9 @@ NOTE: The 4.0.0 Release of SCons dropped Python 2.7 Support NOTE: 4.3.0 now requires Python 3.6.0 and above. Python 3.5.x is no longer supported RELEASE VERSION/DATE TO BE FILLED IN LATER + From Sten Grüner: + - Fix of --debug=sconscript option to return exist statements when using return + statement with stop flag enabled From Michał Górny: - Remove unecessary dependencies on pypi packages from setup.cfg diff --git a/test/option/debug-sconscript.py b/test/option/debug-sconscript.py index 9638f79149..337a2c4e72 100644 --- a/test/option/debug-sconscript.py +++ b/test/option/debug-sconscript.py @@ -51,6 +51,18 @@ 'scons: Exiting %s%sSConstruct' % (wpath, os.sep) ] test.must_contain_all_lines(test.stdout(), expect) + +# Ensure that reutrns with stop are handled properly + +test.write('SConstruct', """\ +foo = "bar" +Return("foo", stop=True) +print("SConstruct") +""") + +test.run(arguments="--debug=sconscript .") +test.must_contain_all_lines(test.stdout(), expect) + test.pass_test() # Local Variables: