tests: shell: adjust add-after-delete flowtable for older kernels

Remove counter from flowtable, older kernels (<=5.4) do not support this
in testcases/flowtable/0013addafterdelete_0 so this bug is still
covered.

Skip testcases/flowtable/0014addafterdelete_0 if flowtable counter
support is not available.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/tests/shell/testcases/flowtable/0013addafterdelete_0 b/tests/shell/testcases/flowtable/0013addafterdelete_0
index b23ab9782909e49a1ec98deab4ddbbd88c6b46d3..56c9834f526f9fee12ff81741ba3b9367595a136 100755 (executable)
--- a/tests/shell/testcases/flowtable/0013addafterdelete_0
+++ b/tests/shell/testcases/flowtable/0013addafterdelete_0
@@ -7,7 +7,6 @@ RULESET='table inet filter {
     flowtable f {
        hook ingress priority filter - 1
        devices = { lo }
-       counter
     }
 }'
 
@@ -20,7 +19,6 @@ table inet filter {
     flowtable f {
        hook ingress priority filter - 1
        devices = { lo }
-       counter
     }
 }'
 

diff --git a/tests/shell/testcases/flowtable/0014addafterdelete_0 b/tests/shell/testcases/flowtable/0014addafterdelete_0
index 6a24c4b9a140613f5bebd023843fb495b090cf7c..1ac651044d48f79e6bb313c32ff41aec9cc65b90 100755 (executable)
--- a/tests/shell/testcases/flowtable/0014addafterdelete_0
+++ b/tests/shell/testcases/flowtable/0014addafterdelete_0
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_flowtable_counter)
+
 set -e
 
 RULESET='table inet filter {

diff --git a/tests/shell/testcases/flowtable/dumps/0013addafterdelete_0.nft b/tests/shell/testcases/flowtable/dumps/0013addafterdelete_0.nft
index 83fdd5d01d3a82fc02762865234c232190da6915..67db7d029392cbc90d1118ffed3ed42c98ac5003 100644 (file)
--- a/tests/shell/testcases/flowtable/dumps/0013addafterdelete_0.nft
+++ b/tests/shell/testcases/flowtable/dumps/0013addafterdelete_0.nft
@@ -2,6 +2,5 @@ table inet filter {
        flowtable f {
                hook ingress priority filter - 1
                devices = { lo }
-               counter
        }
 }