diff mbox series

[ovs-dev,branch-2.8] tests: Make packet-type-aware.at hash independent

Message ID AM4PR07MB3073FA981F6018F2D934D95D9FC10@AM4PR07MB3073.eurprd07.prod.outlook.com
State Accepted
Headers show
Series [ovs-dev,branch-2.8] tests: Make packet-type-aware.at hash independent | expand

Commit Message

Balazs Nemeth Feb. 26, 2018, 9:17 a.m. UTC
When compiling with -msse4.2 a test case of packet-type-aware.at will
fail due to the CRC32 based hash function is different from mhash.
Fix this issue with parsing the port statistics one-by-one.

Signed-off-by: Balazs Nemeth <balazs.nemeth@ericsson.com>
CC: Jan Scheurich <jan.scheurich@ericsson.com>
CC: Zoltan Balogh <zoltan.balogh@ericsson.com>
Fixes: 0d87cb5b6757 ("xlate: fix xport lookup for recirc")
---
 tests/packet-type-aware.at | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--
1.9.1

Comments

Ben Pfaff Feb. 26, 2018, 10:38 p.m. UTC | #1
On Mon, Feb 26, 2018 at 09:17:57AM +0000, Balazs Nemeth wrote:
> When compiling with -msse4.2 a test case of packet-type-aware.at will
> fail due to the CRC32 based hash function is different from mhash.
> Fix this issue with parsing the port statistics one-by-one.
> 
> Signed-off-by: Balazs Nemeth <balazs.nemeth@ericsson.com>
> CC: Jan Scheurich <jan.scheurich@ericsson.com>
> CC: Zoltan Balogh <zoltan.balogh@ericsson.com>
> Fixes: 0d87cb5b6757 ("xlate: fix xport lookup for recirc")

I applied this to branch-2.8.
diff mbox series

Patch

diff --git a/tests/packet-type-aware.at b/tests/packet-type-aware.at
index f43095c..c289bb4 100644
--- a/tests/packet-type-aware.at
+++ b/tests/packet-type-aware.at
@@ -1027,10 +1027,15 @@  tunnel(src=20.0.0.2,dst=20.0.0.1,flags(-df-csum)),recirc_id(0x1),in_port(gre_sys
 ovs-appctl time/warp 1000

 AT_CHECK([
-    ovs-ofctl dump-ports int-br
-], [0], [OFPST_PORT reply (xid=0x2): 2 ports
+    ovs-ofctl dump-ports int-br | grep -A1 LOCAL:
+], [0], [dnl
   port LOCAL: rx pkts=0, bytes=0, drop=?, errs=?, frame=?, over=?, crc=?
            tx pkts=4, bytes=392, drop=?, errs=?, coll=?
+])
+
+AT_CHECK([
+    ovs-ofctl dump-ports int-br | grep -A1 2:
+], [0], [dnl
   port  2: rx pkts=4, bytes=352, drop=?, errs=?, frame=?, over=?, crc=?
            tx pkts=0, bytes=0, drop=?, errs=?, coll=?
 ])