From: Yi Chen <yiche@redhat.com>
Date: Sun, 22 Jun 2025 12:55:51 +0000 (+0800)
Subject: test: shell: Don't use system nft binary
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c73eadca05c781ebad631331a6864fa8c54a5024;p=thirdparty%2Fnftables.git

test: shell: Don't use system nft binary

Use the defined $NFT variable instead of calling the system nft binary directly.
Add a nat_ftp.nodump file to avoid the following check-tree.sh error:
ERR: "tests/shell/testcases/packetpath/nat_ftp" has no "tests/shell/testcases/packetpath/dumps/nat_ftp.{nft,nodump}" file.

Signed-off-by: Yi Chen <yiche@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
---

diff --git a/tests/shell/testcases/packetpath/dumps/nat_ftp.nodump b/tests/shell/testcases/packetpath/dumps/nat_ftp.nodump
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/shell/testcases/packetpath/flowtables b/tests/shell/testcases/packetpath/flowtables
index b68c5dd4..ab11431f 100755
--- a/tests/shell/testcases/packetpath/flowtables
+++ b/tests/shell/testcases/packetpath/flowtables
@@ -67,7 +67,7 @@ sleep 3
 ip netns exec $C ping -q -6 2001:db8:ffff:22::1 -c1
 assert_pass "topo initialization"
 
-ip netns exec $R nft -f - <<EOF
+ip netns exec $R $NFT -f - <<EOF
 table ip6 filter {
         flowtable f1 {
                 hook ingress priority -100
@@ -88,7 +88,7 @@ assert_pass "apply nft ruleset"
 
 if [ ! -r /proc/net/nf_conntrack ]
 then
-	echo "E: nf_conntrack unreadable, skipping" >&2	
+	echo "E: nf_conntrack unreadable, skipping" >&2
 	exit 77
 fi
 
diff --git a/tests/shell/testcases/packetpath/nat_ftp b/tests/shell/testcases/packetpath/nat_ftp
index 327047b8..738bcb98 100755
--- a/tests/shell/testcases/packetpath/nat_ftp
+++ b/tests/shell/testcases/packetpath/nat_ftp
@@ -20,7 +20,7 @@ assert_pass()
 	if [ $ret != 0 ]
 	then
 		echo "FAIL: ${@}"
-		ip netns exec $R nft list ruleset
+		ip netns exec $R $NFT list ruleset
 		tcpdump -nnr ${PCAP}
 		test -r /proc/net/nf_conntrack && ip netns exec $R cat /proc/net/nf_conntrack
 		ip netns exec $R conntrack -S
@@ -82,7 +82,7 @@ assert_pass "topo initialization"
 reload_ruleset()
 {
 	ip netns exec $R conntrack -F 2> /dev/null
-	ip netns exec $R nft -f - <<-EOF
+	ip netns exec $R $NFT -f - <<-EOF
 	flush ruleset
 	table ip6 ftp_helper_nat_test {
 		ct helper ftp-standard {