[PATCH nft] tests: shell: check for features not available in 5.4

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



5.4 -stable kernels report failures in these tests, this kernel version
is lacking these feature.

The bitshift requirement is needed by this ruleset:

 table ip x {
        set s13 {
                typeof tcp option mptcp subtype
                elements = { mp-join, dss }
        }

        chain y {
                tcp option mptcp subtype @s13 accept
        }
 }

which uses bitshift in its bytecode.

Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
---
 tests/shell/testcases/json/single_flag   | 1 +
 tests/shell/testcases/sets/elem_limit_0  | 2 +-
 tests/shell/testcases/sets/set_stmt      | 2 ++
 tests/shell/testcases/sets/typeof_sets_0 | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/shell/testcases/json/single_flag b/tests/shell/testcases/json/single_flag
index 41fab63b0a23..43ae4528a179 100755
--- a/tests/shell/testcases/json/single_flag
+++ b/tests/shell/testcases/json/single_flag
@@ -7,6 +7,7 @@
 #   recognized in input (checked against standard syntax input/output)
 
 # NFT_TEST_REQUIRES(NFT_TEST_HAVE_json)
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_table_flag_persist)
 
 set -e
 
diff --git a/tests/shell/testcases/sets/elem_limit_0 b/tests/shell/testcases/sets/elem_limit_0
index b57f9274bcd0..ed6009166fb9 100755
--- a/tests/shell/testcases/sets/elem_limit_0
+++ b/tests/shell/testcases/sets/elem_limit_0
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-## requires EXPR
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_set_expr)
 
 set -e
 
diff --git a/tests/shell/testcases/sets/set_stmt b/tests/shell/testcases/sets/set_stmt
index 0433b6768b69..ea50525a8037 100755
--- a/tests/shell/testcases/sets/set_stmt
+++ b/tests/shell/testcases/sets/set_stmt
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_set_expr)
+
 test_set_stmt() {
 	local i=$1
 	local stmt1=$2
diff --git a/tests/shell/testcases/sets/typeof_sets_0 b/tests/shell/testcases/sets/typeof_sets_0
index ef2726db3b30..28e39b4d2cb3 100755
--- a/tests/shell/testcases/sets/typeof_sets_0
+++ b/tests/shell/testcases/sets/typeof_sets_0
@@ -5,6 +5,7 @@
 # ways for declaration.
 
 # NFT_TEST_REQUIRES(NFT_TEST_HAVE_ip_options)
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_bitshift)
 
 set -e
 
-- 
2.30.2





[Index of Archives]     [Netfitler Users]     [Berkeley Packet Filter]     [LARTC]     [Bugtraq]     [Yosemite Forum]

  Powered by Linux