From 88ba0c92754d89c71dab11f701839522a5ddb5a9 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Fri, 25 Jan 2019 15:09:41 +0100 Subject: 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 --- tests/py/arp/arp.t.payload | 6 ++++-- tests/py/arp/arp.t.payload.netdev | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'tests/py/arp') diff --git a/tests/py/arp/arp.t.payload b/tests/py/arp/arp.t.payload index bb95e1c1..33e73417 100644 --- a/tests/py/arp/arp.t.payload +++ b/tests/py/arp/arp.t.payload @@ -272,8 +272,10 @@ arp test-arp input arp test-arp input [ meta load iifname => reg 1 ] [ cmp eq reg 1 0x61766e69 0x0064696c 0x00000000 0x00000000 ] - [ payload load 6b @ network header + 0 => reg 1 ] - [ cmp eq reg 1 0x00080100 0x00000406 ] + [ payload load 4b @ network header + 0 => reg 1 ] + [ cmp eq reg 1 0x00080100 ] + [ payload load 2b @ network header + 4 => reg 1 ] + [ cmp eq reg 1 0x00000406 ] [ payload load 4b @ network header + 24 => reg 1 ] [ cmp eq reg 1 0x108fa8c0 ] [ immediate reg 1 0x44332211 0x00006655 ] diff --git a/tests/py/arp/arp.t.payload.netdev b/tests/py/arp/arp.t.payload.netdev index 00c26ccc..4fcf3504 100644 --- a/tests/py/arp/arp.t.payload.netdev +++ b/tests/py/arp/arp.t.payload.netdev @@ -364,8 +364,10 @@ netdev test-netdev ingress [ cmp eq reg 1 0x61766e69 0x0064696c 0x00000000 0x00000000 ] [ meta load protocol => reg 1 ] [ cmp eq reg 1 0x00000608 ] - [ payload load 6b @ network header + 0 => reg 1 ] - [ cmp eq reg 1 0x00080100 0x00000406 ] + [ payload load 4b @ network header + 0 => reg 1 ] + [ cmp eq reg 1 0x00080100 ] + [ payload load 2b @ network header + 4 => reg 1 ] + [ cmp eq reg 1 0x00000406 ] [ payload load 4b @ network header + 24 => reg 1 ] [ cmp eq reg 1 0x108fa8c0 ] [ immediate reg 1 0x44332211 0x00006655 ] -- cgit v1.2.3