]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
tests/shell: print the NFT setting with the VALGRIND=y wrapper
authorThomas Haller <thaller@redhat.com>
Thu, 7 Sep 2023 22:07:17 +0000 (00:07 +0200)
committerFlorian Westphal <fw@strlen.de>
Fri, 8 Sep 2023 09:50:41 +0000 (11:50 +0200)
With this we see in the info output

  I: info: NFT=./tests/shell/helpers/nft-valgrind-wrapper.sh

Signed-off-by: Thomas Haller <thaller@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
tests/shell/run-tests.sh

index ab91fd4d905391768114e238ff8cb09fcb3a5e40..4f0df3217b76ce8d985e71d982432beb93fb219c 100755 (executable)
@@ -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