From: Thomas Haller <thaller@redhat.com>
To: NetFilter <netfilter-devel@vger.kernel.org>
Cc: Florian Westphal <fw@strlen.de>, Thomas Haller <thaller@redhat.com>
Subject: [PATCH nft 05/14] tests/shell: skip bitshift tests if kernel lacks support
Date: Mon, 18 Sep 2023 12:28:19 +0200 [thread overview]
Message-ID: <20230918102947.2125883-6-thaller@redhat.com> (raw)
In-Reply-To: <20230918102947.2125883-1-thaller@redhat.com>
From: Florian Westphal <fw@strlen.de>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Thomas Haller <thaller@redhat.com>
---
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 000000000000..7f9ccb64f0e6
--- /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 4280e33ac45a..4ecc9d3d6c83 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 7e71f3eb43a8..bd9e028df78c 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 94ebe976c987..5e66a27a0498 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 b491565ca573..21dda6701d38 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 adc5f25ba930..e5c8a42a0eb4 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 286b7b1fc7f9..184fbed0701d 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 9ea82952ef24..129dd5c085f4 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 ff9cfb55ac3e..791a7943581d 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 b348ee9367df..5e7bd28da754 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 d19447d42b22..a7b60fb87812 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.41.0
next prev parent reply other threads:[~2023-09-18 10:32 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-18 10:28 [PATCH nft 00/14] tests/shell: fix tests to skip on lacking feature support Thomas Haller
2023-09-18 10:28 ` [PATCH nft 01/14] tests/shell: add and use chain binding feature probe Thomas Haller
2023-09-18 10:28 ` [PATCH nft 02/14] tests/shell: skip netdev_chain_0 if kernel requires netdev device Thomas Haller
2023-09-18 10:28 ` [PATCH nft 03/14] tests/shell: skip map query if kernel lacks support Thomas Haller
2023-09-18 10:28 ` [PATCH nft 04/14] tests/shell: skip inner matching tests if unsupported Thomas Haller
2023-09-18 10:28 ` Thomas Haller [this message]
2023-09-18 10:28 ` [PATCH nft 06/14] tests/shell: skip some tests if kernel lacks netdev egress support Thomas Haller
2023-09-18 10:28 ` [PATCH nft 07/14] tests/shell: skip inet ingress tests if kernel lacks support Thomas Haller
2023-09-18 10:28 ` [PATCH nft 08/14] tests/shell: skip destroy " Thomas Haller
2023-09-18 10:28 ` [PATCH nft 09/14] tests/shell: skip catchall " Thomas Haller
2023-09-18 10:28 ` [PATCH nft 10/14] tests/shell: skip test cases involving osf match " Thomas Haller
2023-09-18 10:28 ` [PATCH nft 11/14] tests/shell: skip test cases if ct expectation and/or timeout " Thomas Haller
2023-09-18 10:28 ` [PATCH nft 12/14] tests/shell: skip reset tests if kernel " Thomas Haller
2023-09-18 10:28 ` [PATCH nft 13/14] tests/shell: implement NFT_TEST_HAVE_json feature detection as script Thomas Haller
2023-09-18 10:28 ` [PATCH nft 14/14] tests/shell: check diff in "maps/typeof_maps_0" and "sets/typeof_sets_0" test Thomas Haller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230918102947.2125883-6-thaller@redhat.com \
--to=thaller@redhat.com \
--cc=fw@strlen.de \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).