summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2023-09-18 12:28:22 +0200
committerFlorian Westphal <fw@strlen.de>2023-09-18 13:08:49 +0200
commitdc913f03d6cf8b1cb8b7a1364351792152a2faca (patch)
tree9b9369ceefdb4143f976edfd8fe5f55ad538c5f0
parent362039ad507b6bc5b9a0a2c4b6eb9e8911563e04 (diff)
tests/shell: skip destroy tests if kernel lacks support
Destroy support was added for table/flowtable/chain etc. in a single commit, so no need to add capability tests for each destroy subtype. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Thomas Haller <thaller@redhat.com>
-rw-r--r--tests/shell/features/destroy.nft3
-rwxr-xr-xtests/shell/testcases/chains/0044chain_destroy_02
-rwxr-xr-xtests/shell/testcases/flowtable/0015destroy_02
-rwxr-xr-xtests/shell/testcases/maps/0014destroy_02
-rwxr-xr-xtests/shell/testcases/rule_management/0012destroy_02
-rwxr-xr-xtests/shell/testcases/sets/0072destroy_02
6 files changed, 13 insertions, 0 deletions
diff --git a/tests/shell/features/destroy.nft b/tests/shell/features/destroy.nft
new file mode 100644
index 00000000..b97242e4
--- /dev/null
+++ b/tests/shell/features/destroy.nft
@@ -0,0 +1,3 @@
+# f80a612dd77c ("netfilter: nf_tables: add support to destroy operation")
+# v6.3-rc1~162^2~264^2
+destroy table t
diff --git a/tests/shell/testcases/chains/0044chain_destroy_0 b/tests/shell/testcases/chains/0044chain_destroy_0
index 8384da66..1763d802 100755
--- a/tests/shell/testcases/chains/0044chain_destroy_0
+++ b/tests/shell/testcases/chains/0044chain_destroy_0
@@ -1,5 +1,7 @@
#!/bin/sh -e
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_destroy)
+
$NFT add table t
# pass for non-existent chain
diff --git a/tests/shell/testcases/flowtable/0015destroy_0 b/tests/shell/testcases/flowtable/0015destroy_0
index 66fce499..9e91ef50 100755
--- a/tests/shell/testcases/flowtable/0015destroy_0
+++ b/tests/shell/testcases/flowtable/0015destroy_0
@@ -1,5 +1,7 @@
#!/bin/sh -e
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_destroy)
+
$NFT add table t
# pass for non-existent flowtable
diff --git a/tests/shell/testcases/maps/0014destroy_0 b/tests/shell/testcases/maps/0014destroy_0
index 14c3f78a..b17d0021 100755
--- a/tests/shell/testcases/maps/0014destroy_0
+++ b/tests/shell/testcases/maps/0014destroy_0
@@ -1,5 +1,7 @@
#!/bin/sh -e
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_destroy)
+
$NFT add table x
# pass for non-existent map
diff --git a/tests/shell/testcases/rule_management/0012destroy_0 b/tests/shell/testcases/rule_management/0012destroy_0
index 85f9c9f6..46a906cf 100755
--- a/tests/shell/testcases/rule_management/0012destroy_0
+++ b/tests/shell/testcases/rule_management/0012destroy_0
@@ -1,5 +1,7 @@
#!/bin/sh -e
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_destroy)
+
$NFT add table t
$NFT add chain t c
diff --git a/tests/shell/testcases/sets/0072destroy_0 b/tests/shell/testcases/sets/0072destroy_0
index fd1d6450..6399dd0f 100755
--- a/tests/shell/testcases/sets/0072destroy_0
+++ b/tests/shell/testcases/sets/0072destroy_0
@@ -1,5 +1,7 @@
#!/bin/sh -e
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_destroy)
+
$NFT add table x
# pass for non-existent set