tests: shell: split map test

Split interval + concatenation into a separated file, so older kernels
with no pipapo can still run what it is supported.

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

diff --git a/tests/shell/testcases/maps/0012map_0 b/tests/shell/testcases/maps/0012map_0
index 49e51b755b0fcc7087aeffce93c3c15362109b11..dd93c482f4413578bae592083e8a33bc3d8f38ca 100755 (executable)
--- a/tests/shell/testcases/maps/0012map_0
+++ b/tests/shell/testcases/maps/0012map_0
@@ -15,22 +15,3 @@ table ip x {
 }"
 
 $NFT -f - <<< "$EXPECTED"
-
-EXPECTED="table ip x {
-       map w {
-               typeof ip saddr . meta mark : verdict
-               flags interval
-               counter
-               elements = {
-                       127.0.0.1-127.0.0.4 . 0x123434-0xb00122 : accept,
-               }
-       }
-
-       chain k {
-               type filter hook input priority filter + 1; policy accept;
-               meta mark set 0x123434
-               ip saddr . meta mark vmap @w
-       }
-}"
-
-$NFT -f - <<< "$EXPECTED"

diff --git a/tests/shell/testcases/maps/0012map_concat_0 b/tests/shell/testcases/maps/0012map_concat_0
new file mode 100755 (executable)
index 0000000..d18c7a7
--- /dev/null
+++ b/tests/shell/testcases/maps/0012map_concat_0
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_pipapo)
+
+set -e
+
+EXPECTED="table ip x {
+        map w {
+                typeof ip saddr . meta mark : verdict
+                flags interval
+                counter
+                elements = {
+                        127.0.0.1-127.0.0.4 . 0x123434-0xb00122 : accept,
+                }
+        }
+
+        chain k {
+                type filter hook input priority filter + 1; policy accept;
+                meta mark set 0x123434
+                ip saddr . meta mark vmap @w
+        }
+}"
+
+$NFT -f - <<< "$EXPECTED"

diff --git a/tests/shell/testcases/maps/dumps/0012map_0.nft b/tests/shell/testcases/maps/dumps/0012map_0.nft
index 895490cffa8c1be6ad780756b921bd522192d3b0..e734fc1c70b9383d436c91abb5c95a0139eaebe4 100644 (file)
--- a/tests/shell/testcases/maps/dumps/0012map_0.nft
+++ b/tests/shell/testcases/maps/dumps/0012map_0.nft
@@ -6,20 +6,7 @@ table ip x {
                             "eth1" : drop }
        }
 
-       map w {
-               typeof ip saddr . meta mark : verdict
-               flags interval
-               counter
-               elements = { 127.0.0.1-127.0.0.4 . 0x00123434-0x00b00122 counter packets 0 bytes 0 : accept }
-       }
-
        chain y {
                iifname vmap { "lo" : accept, "eth0" : drop, "eth1" : drop }
        }
-
-       chain k {
-               type filter hook input priority filter + 1; policy accept;
-               meta mark set 0x00123434
-               ip saddr . meta mark vmap @w
-       }
 }

diff --git a/tests/shell/testcases/maps/dumps/0012map_concat_0.nft b/tests/shell/testcases/maps/dumps/0012map_concat_0.nft
new file mode 100644 (file)
index 0000000..6649d03
--- /dev/null
+++ b/tests/shell/testcases/maps/dumps/0012map_concat_0.nft
@@ -0,0 +1,14 @@
+table ip x {
+       map w {
+               typeof ip saddr . meta mark : verdict
+               flags interval
+               counter
+               elements = { 127.0.0.1-127.0.0.4 . 0x00123434-0x00b00122 counter packets 0 bytes 0 : accept }
+       }
+
+       chain k {
+               type filter hook input priority filter + 1; policy accept;
+               meta mark set 0x00123434
+               ip saddr . meta mark vmap @w
+       }
+}