From: YAMAMOTO Takashi Date: Fri, 20 Dec 2013 10:31:01 +0000 (+0900) Subject: tests/ofproto-dpif.at: Portability improvement X-Git-Tag: sliver-openvswitch-2.1.90-1~10^2~105 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=226dfd837c760f9126b5a4312e88b0dee836b2ab;p=sliver-openvswitch.git tests/ofproto-dpif.at: Portability improvement The output of "wc -l" have leading spaces on some platforms. (NetBSD, OSX, ...) This fixes a test failure introduced by commit e79a6c83. ("ofproto: Handle flow installation and eviction in upcall.") Signed-off-by: YAMAMOTO Takashi Signed-off-by: Ben Pfaff --- diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index 9cd23938d..e81314750 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -2105,13 +2105,9 @@ sleep 1 OVS_VSWITCHD_STOP ovs-appctl -t test-netflow exit -AT_CHECK([grep "192.168.0.1 > 192.168.0.2, if 1 > 65535, 1 pkts, 60 bytes, ICMP 8:0" netflow.log | wc -l], [0], [dnl -1 -], [ignore]) +AT_CHECK([test `grep "192.168.0.1 > 192.168.0.2, if 1 > 65535, 1 pkts, 60 bytes, ICMP 8:0" netflow.log | wc -l` -eq 1]) -AT_CHECK([grep "192.168.0.1 > 192.168.0.2, if 1 > 2, 1 pkts, 60 bytes, ICMP 8:0" netflow.log | wc -l], [0], [dnl -1 -], [ignore]) +AT_CHECK([test `grep "192.168.0.1 > 192.168.0.2, if 1 > 2, 1 pkts, 60 bytes, ICMP 8:0" netflow.log | wc -l` -eq 1]) combined=`grep "192.168.0.2 > 192.168.0.1, if 2 > 1, 2 pkts, 120 bytes, ICMP 0:0" netflow.log | wc -l` separate=`grep "192.168.0.2 > 192.168.0.1, if 2 > 1, 1 pkts, 60 bytes, ICMP 0:0" netflow.log | wc -l`