diff options
author | Florian Westphal <fw@strlen.de> | 2019-01-25 15:09:41 +0100 |
---|---|---|
committer | Florian Westphal <fw@strlen.de> | 2019-01-25 15:10:23 +0100 |
commit | 88ba0c92754d89c71dab11f701839522a5ddb5a9 (patch) | |
tree | 93e60ed790a7c85ddd7588c8fbf66c9429de5633 /tests/py/ip | |
parent | f5821e0b8a4813c0a0b9909f97d0db8855d04ffd (diff) |
tests: fix up expected payloads after expr merge change
nft currently doesn't do payload merging anymore in some cases,
so fix up the expected output.
Fixes: ce2651222911 ("payload: refine payload expr merging")
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'tests/py/ip')
-rw-r--r-- | tests/py/ip/ip.t.payload | 6 | ||||
-rw-r--r-- | tests/py/ip/ip.t.payload.bridge | 6 | ||||
-rw-r--r-- | tests/py/ip/ip.t.payload.inet | 6 | ||||
-rw-r--r-- | tests/py/ip/ip.t.payload.netdev | 6 |
4 files changed, 16 insertions, 8 deletions
diff --git a/tests/py/ip/ip.t.payload b/tests/py/ip/ip.t.payload index eba79dec..d627b22f 100644 --- a/tests/py/ip/ip.t.payload +++ b/tests/py/ip/ip.t.payload @@ -370,8 +370,10 @@ ip test-ip4 input # ip saddr 192.168.3.1 ip daddr 192.168.3.100 ip test-ip4 input - [ payload load 8b @ network header + 12 => reg 1 ] - [ cmp eq reg 1 0x0103a8c0 0x6403a8c0 ] + [ payload load 4b @ network header + 12 => reg 1 ] + [ cmp eq reg 1 0x0103a8c0 ] + [ payload load 4b @ network header + 16 => reg 1 ] + [ cmp eq reg 1 0x6403a8c0 ] # ip saddr != 1.1.1.1 ip test-ip4 input diff --git a/tests/py/ip/ip.t.payload.bridge b/tests/py/ip/ip.t.payload.bridge index f16759bf..ad1d0aa8 100644 --- a/tests/py/ip/ip.t.payload.bridge +++ b/tests/py/ip/ip.t.payload.bridge @@ -482,8 +482,10 @@ bridge test-bridge input bridge test-bridge input [ payload load 2b @ link header + 12 => reg 1 ] [ cmp eq reg 1 0x00000008 ] - [ payload load 8b @ network header + 12 => reg 1 ] - [ cmp eq reg 1 0x0103a8c0 0x6403a8c0 ] + [ payload load 4b @ network header + 12 => reg 1 ] + [ cmp eq reg 1 0x0103a8c0 ] + [ payload load 4b @ network header + 16 => reg 1 ] + [ cmp eq reg 1 0x6403a8c0 ] # ip saddr != 1.1.1.1 bridge test-bridge input diff --git a/tests/py/ip/ip.t.payload.inet b/tests/py/ip/ip.t.payload.inet index 12b03e2e..b9cb28a2 100644 --- a/tests/py/ip/ip.t.payload.inet +++ b/tests/py/ip/ip.t.payload.inet @@ -482,8 +482,10 @@ inet test-inet input inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x00000002 ] - [ payload load 8b @ network header + 12 => reg 1 ] - [ cmp eq reg 1 0x0103a8c0 0x6403a8c0 ] + [ payload load 4b @ network header + 12 => reg 1 ] + [ cmp eq reg 1 0x0103a8c0 ] + [ payload load 4b @ network header + 16 => reg 1 ] + [ cmp eq reg 1 0x6403a8c0 ] # ip saddr != 1.1.1.1 inet test-inet input diff --git a/tests/py/ip/ip.t.payload.netdev b/tests/py/ip/ip.t.payload.netdev index 187a39f3..588e5ca2 100644 --- a/tests/py/ip/ip.t.payload.netdev +++ b/tests/py/ip/ip.t.payload.netdev @@ -395,8 +395,10 @@ netdev test-netdev ingress netdev test-netdev ingress [ meta load protocol => reg 1 ] [ cmp eq reg 1 0x00000008 ] - [ payload load 8b @ network header + 12 => reg 1 ] - [ cmp eq reg 1 0x0103a8c0 0x6403a8c0 ] + [ payload load 4b @ network header + 12 => reg 1 ] + [ cmp eq reg 1 0x0103a8c0 ] + [ payload load 4b @ network header + 16 => reg 1 ] + [ cmp eq reg 1 0x6403a8c0 ] # ip saddr 1.1.1.1 netdev test-netdev ingress |