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>

diff --git a/tests/py/arp/arp.t.payload b/tests/py/arp/arp.t.payload
index bb95e1c14be049af5eec287a5a27e69436b28635..33e7341716d198c6fd71c4fdce9f3e93c3381144 100644 (file)
--- 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 00c26ccc1932f799129a1d5e75986f03827f6474..4fcf35049de222ea740279ac2ffebdd7ce7c5f97 100644 (file)
--- 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 ]

diff --git a/tests/py/inet/tcp.t b/tests/py/inet/tcp.t
index f96e3634f41ed5ce1ea3f8048fe3384a0e74fd0c..e0a83e2b4152f3c534e426971145bbc889048991 100644 (file)
--- a/tests/py/inet/tcp.t
+++ b/tests/py/inet/tcp.t
@@ -38,8 +38,8 @@ tcp sport 8080 drop;ok
 tcp sport 1024 tcp dport 22;ok
 tcp sport 1024 tcp dport 22 tcp sequence 0;ok
 
-tcp sequence 0 tcp sport 1024 tcp dport 22;ok;tcp sport 1024 tcp dport 22 tcp sequence 0
-tcp sequence 0 tcp sport { 1024, 1022} tcp dport 22;ok;tcp sport { 1022, 1024} tcp dport 22 tcp sequence 0
+tcp sequence 0 tcp sport 1024 tcp dport 22;ok
+tcp sequence 0 tcp sport { 1024, 1022} tcp dport 22;ok;tcp sequence 0 tcp sport { 1022, 1024} tcp dport 22
 
 tcp sequence 22;ok
 tcp sequence != 233;ok

diff --git a/tests/py/inet/tcp.t.payload b/tests/py/inet/tcp.t.payload
index 2390a24ead15c3e2d47c9a9d50370ebbbb68c26c..55f1bc2eff87037f9b91c0c82210d8d955e58499 100644 (file)
--- a/tests/py/inet/tcp.t.payload
+++ b/tests/py/inet/tcp.t.payload
@@ -216,15 +216,19 @@ inet test-inet input
 inet test-inet input
   [ meta load l4proto => reg 1 ]
   [ cmp eq reg 1 0x00000006 ]
-  [ payload load 8b @ transport header + 0 => reg 1 ]
-  [ cmp eq reg 1 0x16000004 0x00000000 ]
+  [ payload load 4b @ transport header + 0 => reg 1 ]
+  [ cmp eq reg 1 0x16000004 ]
+  [ payload load 4b @ transport header + 4 => reg 1 ]
+  [ cmp eq reg 1 0x00000000 ]
 
 # tcp sequence 0 tcp sport 1024 tcp dport 22
 inet test-inet input
   [ meta load l4proto => reg 1 ]
   [ cmp eq reg 1 0x00000006 ]
-  [ payload load 8b @ transport header + 0 => reg 1 ]
-  [ cmp eq reg 1 0x16000004 0x00000000 ]
+  [ payload load 4b @ transport header + 4 => reg 1 ]
+  [ cmp eq reg 1 0x00000000 ]
+  [ payload load 4b @ transport header + 0 => reg 1 ]
+  [ cmp eq reg 1 0x16000004 ]
 
 # tcp sequence 0 tcp sport { 1024, 1022} tcp dport 22
 __set%d test-inet 3
@@ -233,10 +237,12 @@ __set%d test-inet 0
 inet test-inet input
   [ meta load l4proto => reg 1 ]
   [ cmp eq reg 1 0x00000006 ]
+  [ payload load 4b @ transport header + 4 => reg 1 ]
+  [ cmp eq reg 1 0x00000000 ]
   [ payload load 2b @ transport header + 0 => reg 1 ]
   [ lookup reg 1 set __set%d ]
-  [ payload load 6b @ transport header + 2 => reg 1 ]
-  [ cmp eq reg 1 0x00001600 0x00000000 ]
+  [ payload load 2b @ transport header + 2 => reg 1 ]
+  [ cmp eq reg 1 0x00001600 ]
 
 # tcp sequence 22
 inet test-inet input

diff --git a/tests/py/ip/ip.t.payload b/tests/py/ip/ip.t.payload
index eba79dec4f2e9ad9edc41819171ae612458fffbf..d627b22f261481259d7b530b99d72d439bf67fcc 100644 (file)
--- 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 f16759bfbbaeada9e9e2743b1bbca24d91c42d69..ad1d0aa801d556ff51f59b4719481e154f4ece8a 100644 (file)
--- 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 12b03e2e16f245baef48b14429aec1b247c03b0d..b9cb28a22e7a8bc2bc76c6fbade8add21ddc4394 100644 (file)
--- 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 187a39f3ab890f1c841400e0c8677b0e5f972239..588e5ca2a3e30eacc7cb372b7a0ea6de610fdd7a 100644 (file)
--- 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