From 885845468408a816839e85f5533e236ff796d45e Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Mon, 18 Sep 2023 12:28:19 +0200 Subject: [PATCH] tests/shell: skip bitshift tests if kernel lacks support Signed-off-by: Florian Westphal Signed-off-by: Thomas Haller --- tests/shell/features/bitshift.nft | 7 +++++++ tests/shell/testcases/bitwise/0040mark_binop_0 | 2 ++ tests/shell/testcases/bitwise/0040mark_binop_1 | 2 ++ tests/shell/testcases/bitwise/0040mark_binop_2 | 2 ++ tests/shell/testcases/bitwise/0040mark_binop_3 | 2 ++ tests/shell/testcases/bitwise/0040mark_binop_4 | 2 ++ tests/shell/testcases/bitwise/0040mark_binop_5 | 2 ++ tests/shell/testcases/bitwise/0040mark_binop_6 | 2 ++ tests/shell/testcases/bitwise/0040mark_binop_7 | 2 ++ tests/shell/testcases/bitwise/0040mark_binop_8 | 2 ++ tests/shell/testcases/bitwise/0040mark_binop_9 | 2 ++ 11 files changed, 27 insertions(+) create mode 100644 tests/shell/features/bitshift.nft diff --git a/tests/shell/features/bitshift.nft b/tests/shell/features/bitshift.nft new file mode 100644 index 000000000..7f9ccb64f --- /dev/null +++ b/tests/shell/features/bitshift.nft @@ -0,0 +1,7 @@ +# 567d746b55bc ("netfilter: bitwise: add support for shifts.") +# v5.6-rc1~151^2~73^2 +table ip t { + chain c { + meta mark set meta mark << 2 + } +} diff --git a/tests/shell/testcases/bitwise/0040mark_binop_0 b/tests/shell/testcases/bitwise/0040mark_binop_0 index 4280e33ac..4ecc9d3d6 100755 --- a/tests/shell/testcases/bitwise/0040mark_binop_0 +++ b/tests/shell/testcases/bitwise/0040mark_binop_0 @@ -1,5 +1,7 @@ #!/bin/bash +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_bitshift) + set -e RULESET=" diff --git a/tests/shell/testcases/bitwise/0040mark_binop_1 b/tests/shell/testcases/bitwise/0040mark_binop_1 index 7e71f3eb4..bd9e028df 100755 --- a/tests/shell/testcases/bitwise/0040mark_binop_1 +++ b/tests/shell/testcases/bitwise/0040mark_binop_1 @@ -1,5 +1,7 @@ #!/bin/bash +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_bitshift) + set -e RULESET=" diff --git a/tests/shell/testcases/bitwise/0040mark_binop_2 b/tests/shell/testcases/bitwise/0040mark_binop_2 index 94ebe976c..5e66a27a0 100755 --- a/tests/shell/testcases/bitwise/0040mark_binop_2 +++ b/tests/shell/testcases/bitwise/0040mark_binop_2 @@ -1,5 +1,7 @@ #!/bin/bash +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_bitshift) + set -e RULESET=" diff --git a/tests/shell/testcases/bitwise/0040mark_binop_3 b/tests/shell/testcases/bitwise/0040mark_binop_3 index b491565ca..21dda6701 100755 --- a/tests/shell/testcases/bitwise/0040mark_binop_3 +++ b/tests/shell/testcases/bitwise/0040mark_binop_3 @@ -1,5 +1,7 @@ #!/bin/bash +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_bitshift) + set -e RULESET=" diff --git a/tests/shell/testcases/bitwise/0040mark_binop_4 b/tests/shell/testcases/bitwise/0040mark_binop_4 index adc5f25ba..e5c8a42a0 100755 --- a/tests/shell/testcases/bitwise/0040mark_binop_4 +++ b/tests/shell/testcases/bitwise/0040mark_binop_4 @@ -1,5 +1,7 @@ #!/bin/bash +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_bitshift) + set -e RULESET=" diff --git a/tests/shell/testcases/bitwise/0040mark_binop_5 b/tests/shell/testcases/bitwise/0040mark_binop_5 index 286b7b1fc..184fbed07 100755 --- a/tests/shell/testcases/bitwise/0040mark_binop_5 +++ b/tests/shell/testcases/bitwise/0040mark_binop_5 @@ -1,5 +1,7 @@ #!/bin/bash +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_bitshift) + set -e RULESET=" diff --git a/tests/shell/testcases/bitwise/0040mark_binop_6 b/tests/shell/testcases/bitwise/0040mark_binop_6 index 9ea82952e..129dd5c08 100755 --- a/tests/shell/testcases/bitwise/0040mark_binop_6 +++ b/tests/shell/testcases/bitwise/0040mark_binop_6 @@ -1,5 +1,7 @@ #!/bin/bash +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_bitshift) + set -e RULESET=" diff --git a/tests/shell/testcases/bitwise/0040mark_binop_7 b/tests/shell/testcases/bitwise/0040mark_binop_7 index ff9cfb55a..791a79435 100755 --- a/tests/shell/testcases/bitwise/0040mark_binop_7 +++ b/tests/shell/testcases/bitwise/0040mark_binop_7 @@ -1,5 +1,7 @@ #!/bin/bash +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_bitshift) + set -e RULESET=" diff --git a/tests/shell/testcases/bitwise/0040mark_binop_8 b/tests/shell/testcases/bitwise/0040mark_binop_8 index b348ee936..5e7bd28da 100755 --- a/tests/shell/testcases/bitwise/0040mark_binop_8 +++ b/tests/shell/testcases/bitwise/0040mark_binop_8 @@ -1,5 +1,7 @@ #!/bin/bash +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_bitshift) + set -e RULESET=" diff --git a/tests/shell/testcases/bitwise/0040mark_binop_9 b/tests/shell/testcases/bitwise/0040mark_binop_9 index d19447d42..a7b60fb87 100755 --- a/tests/shell/testcases/bitwise/0040mark_binop_9 +++ b/tests/shell/testcases/bitwise/0040mark_binop_9 @@ -1,5 +1,7 @@ #!/bin/bash +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_bitshift) + set -e RULESET=" -- 2.47.3