tests: shell: skip if kernel does not support bitshift

A few tests are missing bitshift checks that has been added to
885845468408 ("tests/shell: skip bitshift tests if kernel lacks
support").

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

diff --git a/tests/shell/testcases/maps/vmap_mark_bitwise_0 b/tests/shell/testcases/maps/vmap_mark_bitwise_0
index 0d933553e6b87d292a5234293958ab7051dee1af..2f305b27bc3334820b790823ddf37bceb00e63db 100755 (executable)
--- a/tests/shell/testcases/maps/vmap_mark_bitwise_0
+++ b/tests/shell/testcases/maps/vmap_mark_bitwise_0
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_bitshift)
+
 set -e
 
 RULESET="table ip x {

diff --git a/tests/shell/testcases/sets/typeof_sets_0 b/tests/shell/testcases/sets/typeof_sets_0
index 35c572c1e5372542292b0eaac2d1881d70065520..92555a1f923efdefac7a62cad6cc398a5c887342 100755 (executable)
--- a/tests/shell/testcases/sets/typeof_sets_0
+++ b/tests/shell/testcases/sets/typeof_sets_0
@@ -17,22 +17,53 @@ INPUT_OSF_SET="
                elements = { \"Linux\" }
        }
 "
+
+INPUT_FRAG_SET="
+       set s4 {
+               typeof frag frag-off
+               elements = { 1, 1024 }
+       }
+"
+
+INPUT_VERSION_SET="
+       set s8 {
+               typeof ip version
+               elements = { 4, 6 }
+       }
+"
+
 INPUT_OSF_CHAIN="
        chain c1 {
                osf name @s1 accept
        }
 "
 
+INPUT_FRAG_CHAIN="
+       chain c4 {
+               frag frag-off @s4 accept
+       }
+"
+
 INPUT_SCTP_CHAIN="
        chain c7 {
                sctp chunk init num-inbound-streams @s7 accept
        }
 "
+INPUT_VERSION_CHAIN="
+       chain c8 {
+               ip version @s8 accept
+       }
+"
 
 if [ "$NFT_TEST_HAVE_sctp_chunks" = n ] ; then
        INPUT_SCTP_CHAIN=
 fi
 
+if [ "$NFT_TEST_HAVE_bitshift" = n ] ; then
+       INPUT_FRAG_CHAIN=
+       INPUT_VERSION_CHAIN=
+fi
+
 if [ "$NFT_TEST_HAVE_osf" = n ] ; then
        if [ "$((RANDOM % 2))" -eq 1 ] ; then
                # Regardless of $NFT_TEST_HAVE_osf, we can define the set.
@@ -51,12 +82,7 @@ INPUT="table inet t {$INPUT_OSF_SET
        set s3 {
                typeof meta ibrpvid
                elements = { 2, 3, 103 }
-       }
-
-       set s4 {
-               typeof frag frag-off
-               elements = { 1, 1024 }
-       }
+       }$INPUT_FRAG_SET
 
        set s5 {
                typeof ip option ra value
@@ -71,12 +97,7 @@ INPUT="table inet t {$INPUT_OSF_SET
        set s7 {
                typeof sctp chunk init num-inbound-streams
                elements = { 1, 4 }
-       }
-
-       set s8 {
-               typeof ip version
-               elements = { 4, 6 }
-       }
+       }$INPUT_VERSION_SET
 
        set s9 {
                typeof ip hdrlength
@@ -96,11 +117,7 @@ $INPUT_OSF_CHAIN
        chain c2 {
                ether type vlan vlan id @s2 accept
        }
-
-       chain c4 {
-               frag frag-off @s4 accept
-       }
-
+$INPUT_FRAG_CHAIN
        chain c5 {
                ip option ra value @s5 accept
        }
@@ -109,10 +126,7 @@ $INPUT_OSF_CHAIN
                tcp option maxseg size @s6 accept
        }
 $INPUT_SCTP_CHAIN
-       chain c8 {
-               ip version @s8 accept
-       }
-
+$INPUT_VERSION_CHAIN
        chain c9 {
                ip hdrlength @s9 accept
        }
@@ -136,12 +150,7 @@ EXPECTED="table inet t {$INPUT_OSF_SET
                typeof meta ibrpvid
                elements = { 2, 3, 103 }
        }
-
-       set s4 {
-               typeof frag frag-off
-               elements = { 1, 1024 }
-       }
-
+$INPUT_FRAG_SET
        set s5 {
                typeof ip option ra value
                elements = { 1, 1024 }
@@ -156,12 +165,7 @@ EXPECTED="table inet t {$INPUT_OSF_SET
                typeof sctp chunk init num-inbound-streams
                elements = { 1, 4 }
        }
-
-       set s8 {
-               typeof ip version
-               elements = { 4, 6 }
-       }
-
+$INPUT_VERSION_SET
        set s9 {
                typeof ip hdrlength
                elements = { 0, 1, 2, 3, 4,
@@ -181,11 +185,7 @@ $INPUT_OSF_CHAIN
        chain c2 {
                vlan id @s2 accept
        }
-
-       chain c4 {
-               frag frag-off @s4 accept
-       }
-
+$INPUT_FRAG_CHAIN
        chain c5 {
                ip option ra value @s5 accept
        }
@@ -193,11 +193,7 @@ $INPUT_OSF_CHAIN
        chain c6 {
                tcp option maxseg size @s6 accept
        }
-$INPUT_SCTP_CHAIN
-       chain c8 {
-               ip version @s8 accept
-       }
-
+$INPUT_SCTP_CHAIN$INPUT_VERSION_CHAIN
        chain c9 {
                ip hdrlength @s9 accept
        }
@@ -216,6 +212,10 @@ $NFT -f - <<< "$INPUT" || die $'nft command failed to process input:\n'">$INPUT<
 
 $DIFF -u <($NFT list ruleset) - <<<"$EXPECTED" || die $'diff failed between ruleset and expected data.\nExpected:\n'">$EXPECTED<"
 
+if [ "$NFT_TEST_HAVE_bitshift" = n ] ; then
+       echo "Partial test due to NFT_TEST_HAVE_bitshift=n. Skip"
+       exit 77
+fi
 if [ "$NFT_TEST_HAVE_osf" = n ] ; then
        echo "Partial test due to NFT_TEST_HAVE_osf=n. Skip"
        exit 77