From dc913f03d6cf8b1cb8b7a1364351792152a2faca Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Mon, 18 Sep 2023 12:28:22 +0200 Subject: 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 Signed-off-by: Thomas Haller --- tests/shell/features/destroy.nft | 3 +++ tests/shell/testcases/chains/0044chain_destroy_0 | 2 ++ tests/shell/testcases/flowtable/0015destroy_0 | 2 ++ tests/shell/testcases/maps/0014destroy_0 | 2 ++ tests/shell/testcases/rule_management/0012destroy_0 | 2 ++ tests/shell/testcases/sets/0072destroy_0 | 2 ++ 6 files changed, 13 insertions(+) create mode 100644 tests/shell/features/destroy.nft 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 -- cgit v1.2.3