From: Florian Westphal Date: Mon, 18 Sep 2023 10:28:19 +0000 (+0200) Subject: tests/shell: skip bitshift tests if kernel lacks support X-Git-Tag: v1.0.9~74 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=885845468408a816839e85f5533e236ff796d45e;p=thirdparty%2Fnftables.git tests/shell: skip bitshift tests if kernel lacks support Signed-off-by: Florian Westphal Signed-off-by: Thomas Haller --- diff --git a/tests/shell/features/bitshift.nft b/tests/shell/features/bitshift.nft new file mode 100644 index 00000000..7f9ccb64 --- /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 4280e33a..4ecc9d3d 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 7e71f3eb..bd9e028d 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 94ebe976..5e66a27a 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 b491565c..21dda670 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 adc5f25b..e5c8a42a 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 286b7b1f..184fbed0 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 9ea82952..129dd5c0 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 ff9cfb55..791a7943 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 b348ee93..5e7bd28d 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 d19447d4..a7b60fb8 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="