From 741b8fe5731a1b623d8eae26c7223345701d5dda Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Sat, 15 Nov 2025 19:08:23 +0100 Subject: [PATCH] Build: document and disentangle dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A long-standing unnecessary mutual dependency caused rebuild of most tests in the standard target, because the ''valgrind suppression'' executable was classified as »tool«, while also depending on the libraies with the test code. --- admin/scons/Setup.py | 2 ++ tests/SConscript | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/admin/scons/Setup.py b/admin/scons/Setup.py index c2c19cca7..b7074f109 100644 --- a/admin/scons/Setup.py +++ b/admin/scons/Setup.py @@ -42,7 +42,9 @@ installUIRes = '#$DESTDIR/share/lumiera/' installConf = '#$DESTDIR/lib/lumiera/config' #-------------------------------------------------------Configuration + buildSetup = Record(locals()) +# passed to LumieraEnvironment() -> env.path.xxxx diff --git a/tests/SConscript b/tests/SConscript index dcf294006..4fb38d9e7 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -97,7 +97,6 @@ Export('testsuite') # for creating a Valgrind-Suppression file vgsuppression = envSuite.Program('vgsuppression',['tool/vgsuppression.c']+list(testLibs)+list(core_lib)) ## for suppressing false valgrind alarms -tools += [vgsuppression] # @@ -144,7 +143,7 @@ Depends(runTests,vgsuppression) # - 'scons testcode' triggers building of the Testsuite # - 'scons check' triggers building and running # -env.Alias('testcode', testsuite ) +env.Alias('testcode', testsuite + vgsuppression) env.Alias('check', runTests ) # allow tempfiles of test.sh to be cleaned