From 4bd60613ea60da4bf9da226be352dd47f585e8d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20N=C4=9Bmec?= Date: Fri, 5 Nov 2021 12:39:11 +0100 Subject: [PATCH] tests: shell: $NFT needs to be invoked unquoted MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The variable has to undergo word splitting, otherwise the shell tries to find the variable value as an executable, which breaks in cases that 7c8a44b25c22 ("tests: shell: Allow wrappers to be passed as nft command") intends to support. Mention this in the shell tests README. Fixes: d8ccad2a2b73 ("tests: cover baecd1cf2685 ("segtree: Fix segfault when restoring a huge interval set")") Signed-off-by: Štěpán Němec Signed-off-by: Phil Sutter (cherry picked from commit dad3338f1f76a4a5bd782bae9c6b48941dfb1e31) Conflicts: tests/shell/README -> Context change due to missing other patches. --- tests/shell/README | 3 +++ tests/shell/testcases/sets/0068interval_stack_overflow_0 | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/shell/README b/tests/shell/README index e0279bbdc30c3..aee50e3d668b1 100644 --- a/tests/shell/README +++ b/tests/shell/README @@ -25,4 +25,7 @@ path to the nftables binary being tested. You can pass an arbitrary $NFT value as well: # NFT=/usr/local/sbin/nft ./run-tests.sh +Note that, to support usage such as NFT='valgrind nft', tests must +invoke $NFT unquoted. + By default the tests are run with the nft binary at '../../src/nft' diff --git a/tests/shell/testcases/sets/0068interval_stack_overflow_0 b/tests/shell/testcases/sets/0068interval_stack_overflow_0 index 134282de28268..6620572449c3c 100755 --- a/tests/shell/testcases/sets/0068interval_stack_overflow_0 +++ b/tests/shell/testcases/sets/0068interval_stack_overflow_0 @@ -26,4 +26,4 @@ table inet test68_table { } EOF -( ulimit -s 128 && "$NFT" -f "$ruleset_file" ) +( ulimit -s 128 && $NFT -f "$ruleset_file" ) -- 2.33.0