summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2018-02-24 12:28:30 +0100
committerFlorian Westphal <fw@strlen.de>2018-02-24 12:28:30 +0100
commit2018bb82f71d57d777b121af96138359ee6b857e (patch)
treeed38a6972296559220bb4e5e8d3e8d6d3dbd31aa
parentdc615b16890273b161971cf5294a259552faa407 (diff)
tests: meta.t: fix test case for anonymous set automerge
commit fb16c8b7f795e0d ("evaluate: Enable automerge feature for anonymous sets") re-enabled merging of adjacent ranges, so 33-55, 56-88 turns into 33-88. Update test case to reflect this. Signed-off-by: Florian Westphal <fw@strlen.de>
-rw-r--r--tests/py/any/meta.t2
-rw-r--r--tests/py/any/meta.t.payload2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/py/any/meta.t b/tests/py/any/meta.t
index 3158e887..9da20d03 100644
--- a/tests/py/any/meta.t
+++ b/tests/py/any/meta.t
@@ -15,7 +15,7 @@ meta length 33-45;ok
meta length != 33-45;ok
meta length { 33, 55, 67, 88};ok
meta length { 33-55, 67-88};ok
-meta length { 33-55, 56-88, 100-120};ok;meta length { 33-55, 56-88, 100-120}
+meta length { 33-55, 56-88, 100-120};ok;meta length { 33-88, 100-120}
meta length != { 33, 55, 67, 88};ok
meta length { 33-55};ok
meta length != { 33-55};ok
diff --git a/tests/py/any/meta.t.payload b/tests/py/any/meta.t.payload
index d0199b8a..48eae4a9 100644
--- a/tests/py/any/meta.t.payload
+++ b/tests/py/any/meta.t.payload
@@ -55,7 +55,7 @@ ip test-ip4 input
# meta length { 33-55, 56-88, 100-120}
__set%d test-ip4 7
__set%d test-ip4 0
- element 00000000 : 1 [end] element 21000000 : 0 [end] element 38000000 : 0 [end] element 59000000 : 1 [end] element 64000000 : 0 [end] element 79000000 : 1 [end]
+ element 00000000 : 1 [end] element 21000000 : 0 [end] element 59000000 : 1 [end] element 64000000 : 0 [end] element 79000000 : 1 [end]
ip test-ip4 input
[ meta load len => reg 1 ]
[ byteorder reg 1 = hton(reg 1, 4, 4) ]