[PATCH nft 0/4] add missing requirements in tests/shell

[PATCH nft 0/4] add missing requirements in tests/shell

[Pablo Neira Ayuso]

Hi,

Several patch to add missing requirements, this has been detected while running
tests on -stable 5.4.

Pablo Neira Ayuso (4):
  tests: shell: payload matching requires egress support
  tests: shell: chains/{netdev_netns_gone,netdev_chain_dev_gone} require inet/ingress support
  tests: shell: maps/{vmap_unary,named_limits} require pipapo set backend
  tests: shell: check for reset tcp options support

 tests/shell/features/reset_tcp_options.nft         | 5 +++++
 tests/shell/testcases/chains/netdev_chain_dev_gone | 2 ++
 tests/shell/testcases/chains/netdev_netns_gone     | 2 ++
 tests/shell/testcases/maps/named_limits            | 2 ++
 tests/shell/testcases/maps/vmap_unary              | 2 ++
 tests/shell/testcases/packetpath/payload           | 2 ++
 tests/shell/testcases/packetpath/set_lookups       | 2 ++
 tests/shell/testcases/packetpath/tcp_options       | 2 ++
 tests/shell/testcases/sets/typeof_sets_concat      | 2 ++
 9 files changed, 21 insertions(+)
 create mode 100644 tests/shell/features/reset_tcp_options.nft

-- 
2.30.2

[PATCH nft 1/4] tests: shell: payload matching requires egress support

[Pablo Neira Ayuso]

Older kernels do not support for egress hook.

Fixes: 84da729e067a ("tests: shell: add test to cover payload transport match and mangle")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 tests/shell/testcases/packetpath/payload | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/shell/testcases/packetpath/payload b/tests/shell/testcases/packetpath/payload
index 9f4587d27e22..4c5c42dafa92 100755
--- a/tests/shell/testcases/packetpath/payload
+++ b/tests/shell/testcases/packetpath/payload
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_netdev_egress)
+
 rnd=$(mktemp -u XXXXXXXX)
 ns1="nft1payload-$rnd"
 ns2="nft2payload-$rnd"
-- 
2.30.2

[PATCH nft 2/4] tests: shell: chains/{netdev_netns_gone,netdev_chain_dev_gone} require inet/ingress support

[Pablo Neira Ayuso]

Fixes: 6847a7ce0fc9 ("tests: shell: cover netns removal for netdev and inet/ingress basechains")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 tests/shell/testcases/chains/netdev_chain_dev_gone | 2 ++
 tests/shell/testcases/chains/netdev_netns_gone     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/tests/shell/testcases/chains/netdev_chain_dev_gone b/tests/shell/testcases/chains/netdev_chain_dev_gone
index 77f828d50df0..99933a31dd7d 100755
--- a/tests/shell/testcases/chains/netdev_chain_dev_gone
+++ b/tests/shell/testcases/chains/netdev_chain_dev_gone
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_inet_ingress)
+
 set -e
 
 iface_cleanup() {
diff --git a/tests/shell/testcases/chains/netdev_netns_gone b/tests/shell/testcases/chains/netdev_netns_gone
index e6b6599691bc..3a92c99e667e 100755
--- a/tests/shell/testcases/chains/netdev_netns_gone
+++ b/tests/shell/testcases/chains/netdev_netns_gone
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_inet_ingress)
+
 set -e
 
 rnd=$(mktemp -u XXXXXXXX)
-- 
2.30.2

[PATCH nft 3/4] tests: shell: maps/{vmap_unary,named_limits} require pipapo set backend

[Pablo Neira Ayuso]

... sets/typeof_sets_concat needs it too.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 tests/shell/testcases/maps/named_limits       | 2 ++
 tests/shell/testcases/maps/vmap_unary         | 2 ++
 tests/shell/testcases/packetpath/set_lookups  | 2 ++
 tests/shell/testcases/sets/typeof_sets_concat | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/tests/shell/testcases/maps/named_limits b/tests/shell/testcases/maps/named_limits
index 5604f6caeda6..ac8e434cce05 100755
--- a/tests/shell/testcases/maps/named_limits
+++ b/tests/shell/testcases/maps/named_limits
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_pipapo)
+
 dumpfile=$(dirname $0)/dumps/$(basename $0).nft
 
 $NFT -f "$dumpfile" || exit 1
diff --git a/tests/shell/testcases/maps/vmap_unary b/tests/shell/testcases/maps/vmap_unary
index 4038d1c109ff..f4e1f01215ec 100755
--- a/tests/shell/testcases/maps/vmap_unary
+++ b/tests/shell/testcases/maps/vmap_unary
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_pipapo)
+
 set -e
 
 RULESET="table ip filter {
diff --git a/tests/shell/testcases/packetpath/set_lookups b/tests/shell/testcases/packetpath/set_lookups
index 84a0000af665..851598580796 100755
--- a/tests/shell/testcases/packetpath/set_lookups
+++ b/tests/shell/testcases/packetpath/set_lookups
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_pipapo)
+
 set -e
 
 $NFT -f /dev/stdin <<"EOF"
diff --git a/tests/shell/testcases/sets/typeof_sets_concat b/tests/shell/testcases/sets/typeof_sets_concat
index 07820b7c4fdd..34465f1da0be 100755
--- a/tests/shell/testcases/sets/typeof_sets_concat
+++ b/tests/shell/testcases/sets/typeof_sets_concat
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_pipapo)
+
 set -e
 dumpfile=$(dirname $0)/dumps/$(basename $0).nft
 
-- 
2.30.2

[PATCH nft 4/4] tests: shell: check for reset tcp options support

[Pablo Neira Ayuso]

Fixes: 59a33d08ab3a ("parser: tcpopt: fix tcp option parsing with NUM + length field")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 tests/shell/features/reset_tcp_options.nft   | 5 +++++
 tests/shell/testcases/packetpath/tcp_options | 2 ++
 2 files changed, 7 insertions(+)
 create mode 100644 tests/shell/features/reset_tcp_options.nft

diff --git a/tests/shell/features/reset_tcp_options.nft b/tests/shell/features/reset_tcp_options.nft
new file mode 100644
index 000000000000..47d1c7b8c5a9
--- /dev/null
+++ b/tests/shell/features/reset_tcp_options.nft
@@ -0,0 +1,5 @@
+table inet t {
+        chain c {
+		reset tcp option fastopen
+	}
+}
diff --git a/tests/shell/testcases/packetpath/tcp_options b/tests/shell/testcases/packetpath/tcp_options
index 88552226ee3a..57e228c5990e 100755
--- a/tests/shell/testcases/packetpath/tcp_options
+++ b/tests/shell/testcases/packetpath/tcp_options
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_reset_tcp_options)
+
 have_socat="no"
 socat -h > /dev/null && have_socat="yes"
 
-- 
2.30.2