From 93ee51b66a6c6b2678d19637f29193f22b7181d4 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 8 Sep 2023 00:07:17 +0200 Subject: tests/shell: print the NFT setting with the VALGRIND=y wrapper With this we see in the info output I: info: NFT=./tests/shell/helpers/nft-valgrind-wrapper.sh Signed-off-by: Thomas Haller Signed-off-by: Florian Westphal --- tests/shell/run-tests.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tests/shell/run-tests.sh') diff --git a/tests/shell/run-tests.sh b/tests/shell/run-tests.sh index ab91fd4d..4f0df321 100755 --- a/tests/shell/run-tests.sh +++ b/tests/shell/run-tests.sh @@ -411,6 +411,11 @@ echo msg_info "info: NFT_TEST_BASEDIR=$(printf '%q' "$NFT_TEST_BASEDIR")" msg_info "info: NFT_TEST_TMPDIR=$(printf '%q' "$NFT_TEST_TMPDIR")" +if [ "$VALGRIND" == "y" ]; then + NFT="$NFT_TEST_BASEDIR/helpers/nft-valgrind-wrapper.sh" + msg_info "info: NFT=$(printf '%q' "$NFT")" +fi + kernel_cleanup() { if [ "$NFT_TEST_JOBS" -ne 0 ] ; then # When we run jobs in parallel (even with only one "parallel" @@ -442,10 +447,6 @@ kernel_cleanup() { nft_xfrm } -if [ "$VALGRIND" == "y" ]; then - NFT="$NFT_TEST_BASEDIR/helpers/nft-valgrind-wrapper.sh" -fi - echo "" ok=0 skipped=0 -- cgit v1.2.3