Skip to contentSkip to conversation

add missing requirements in tests/shell

PATCH New Pablo Neira Ayuso 1 participant 5 messages Apr 8, 2024 netfilter

lore
Share & tools
lore

Pablo Neira Ayuso

author maintainer
#0 lore raw

cover add missing requirements in tests/shell

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
Signature · 1 line
2.30.2
author maintainer
#1 lore raw

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

Older kernels do not support for egress hook.

Fixes 84da729e067a ("tests: shell: add test to cover payload transport match and mangle")
---
 tests/shell/testcases/packetpath/payload | 2 ++
 1 file changed, 2 insertions(+)
tests/shell/testcases/packetpath/payload +2 -0
index 9f4587d27e22..4c5c42dafa92 100755
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_netdev_egress)
+
 rnd=$(mktemp -u XXXXXXXX)
 ns1="nft1payload-$rnd"
 ns2="nft2payload-$rnd"
Signature · 1 line
2.30.2
author maintainer
#2 lore raw

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

In reply to Pablo Neira Ayuso
Fixes 6847a7ce0fc9 ("tests: shell: cover netns removal for netdev and inet/ingress basechains")
---
 tests/shell/testcases/chains/netdev_chain_dev_gone | 2 ++
 tests/shell/testcases/chains/netdev_netns_gone     | 2 ++
 2 files changed, 4 insertions(+)
tests/shell/testcases/chains/netdev_chain_dev_gone +2 -0
index 77f828d50df0..99933a31dd7d 100755
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_inet_ingress)
+
 set -e
 
 iface_cleanup() {
tests/shell/testcases/chains/netdev_netns_gone +2 -0
index e6b6599691bc..3a92c99e667e 100755
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_inet_ingress)
+
 set -e
 
 rnd=$(mktemp -u XXXXXXXX)
Signature · 1 line
2.30.2
author maintainer
#3 lore raw

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

In reply to Pablo Neira Ayuso

... sets/typeof_sets_concat needs it too.

---
 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(+)
tests/shell/testcases/maps/named_limits +2 -0
index 5604f6caeda6..ac8e434cce05 100755
@@ -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
tests/shell/testcases/maps/vmap_unary +2 -0
index 4038d1c109ff..f4e1f01215ec 100755
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_pipapo)
+
 set -e
 
 RULESET="table ip filter {
tests/shell/testcases/packetpath/set_lookups +2 -0
index 84a0000af665..851598580796 100755
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_pipapo)
+
 set -e
 
 $NFT -f /dev/stdin <<"EOF"
tests/shell/testcases/sets/typeof_sets_concat +2 -0
index 07820b7c4fdd..34465f1da0be 100755
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_pipapo)
+
 set -e
 dumpfile=$(dirname $0)/dumps/$(basename $0).nft
 
Signature · 1 line
2.30.2
author maintainer
#4 lore raw

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

In reply to Pablo Neira Ayuso
Fixes 59a33d08ab3a ("parser: tcpopt: fix tcp option parsing with NUM + length field")
---
 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
tests/shell/features/reset_tcp_options.nft new file +5 -0
new file mode 100644
index 000000000000..47d1c7b8c5a9
@@ -0,0 +1,5 @@
+table inet t {
+        chain c {
+		reset tcp option fastopen
+	}
+}
tests/shell/testcases/packetpath/tcp_options +2 -0
index 88552226ee3a..57e228c5990e 100755
@@ -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"
 
Signature · 1 line
2.30.2