From 516de44c9fa0a59b9e4874512793f0d67530a09e Mon Sep 17 00:00:00 2001 From: Brian Conry Date: Thu, 6 May 2021 13:50:44 -0500 Subject: [PATCH 1/2] Preserve SYSTEMTEST_NO_CLEAN when run.sh calls make This restores legacy behavior in bin/tests/system where running: SYSTEMTEST_NO_CLEAN=1 ./run.sh would run the test and preserve the output files. This has been broken since the change that has run.sh invoke "make", due to SYSTEMTEST_NO_CLEAN not being preserved in the environment that's set up for "make". Another option would be to completely remove SYSTEMTEST_NO_CLEAN. This seems to be the only behavior-changing environment variable not accounted for in the call to "make". I don't think this needs a CHANGES entry. --- bin/tests/system/run.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/tests/system/run.sh.in b/bin/tests/system/run.sh.in index 3460ede612..d7fabf319d 100644 --- a/bin/tests/system/run.sh.in +++ b/bin/tests/system/run.sh.in @@ -70,7 +70,7 @@ if ! $do_run; then if [ "$baseport" -eq 0 ]; then log_flags="$log_flags -p 5300" fi - env - SLOT="$SLOT" SOFTHSM2_CONF="$SOFTHSM2_CONF" PATH="$PATH" ${LD_LIBRARY_PATH:+"LD_LIBRARY_PATH=${LD_LIBRARY_PATH}"} TESTS="$*" TEST_SUITE_LOG=run.log LOG_DRIVER_FLAGS="--verbose yes --color-tests yes" LOG_FLAGS="$log_flags" make -e check + env - SYSTEMTEST_NO_CLEAN="$SYSTEMTEST_NO_CLEAN" SLOT="$SLOT" SOFTHSM2_CONF="$SOFTHSM2_CONF" PATH="$PATH" ${LD_LIBRARY_PATH:+"LD_LIBRARY_PATH=${LD_LIBRARY_PATH}"} TESTS="$*" TEST_SUITE_LOG=run.log LOG_DRIVER_FLAGS="--verbose yes --color-tests yes" LOG_FLAGS="$log_flags" make -e check exit $? fi From 44cadaf31bc6c84d65e1e2a8acd7d5b16de4a991 Mon Sep 17 00:00:00 2001 From: Brian Conry Date: Wed, 19 May 2021 09:10:29 -0500 Subject: [PATCH 2/2] Preserve additional environment variables with run.sh When executed in "legacy mode" (i.e. without the '-r' parameter) run.sh invokes make with a modified environment. SYSTEMTEST_FORCE_COLOR is now preserved for use by the individual test scripts. CYGWIN is now preserved for named, as it controls behavior relating to crash reporting. --- bin/tests/system/run.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/tests/system/run.sh.in b/bin/tests/system/run.sh.in index d7fabf319d..7d38c0e3e6 100644 --- a/bin/tests/system/run.sh.in +++ b/bin/tests/system/run.sh.in @@ -70,7 +70,7 @@ if ! $do_run; then if [ "$baseport" -eq 0 ]; then log_flags="$log_flags -p 5300" fi - env - SYSTEMTEST_NO_CLEAN="$SYSTEMTEST_NO_CLEAN" SLOT="$SLOT" SOFTHSM2_CONF="$SOFTHSM2_CONF" PATH="$PATH" ${LD_LIBRARY_PATH:+"LD_LIBRARY_PATH=${LD_LIBRARY_PATH}"} TESTS="$*" TEST_SUITE_LOG=run.log LOG_DRIVER_FLAGS="--verbose yes --color-tests yes" LOG_FLAGS="$log_flags" make -e check + env - CYGWIN="$CYGWIN" SYSTEMTEST_FORCE_COLOR="$SYSTEMTEST_FORCE_COLOR" SYSTEMTEST_NO_CLEAN="$SYSTEMTEST_NO_CLEAN" SLOT="$SLOT" SOFTHSM2_CONF="$SOFTHSM2_CONF" PATH="$PATH" ${LD_LIBRARY_PATH:+"LD_LIBRARY_PATH=${LD_LIBRARY_PATH}"} TESTS="$*" TEST_SUITE_LOG=run.log LOG_DRIVER_FLAGS="--verbose yes --color-tests yes" LOG_FLAGS="$log_flags" make -e check exit $? fi