On Mon, Apr 24, 2017 at 9:48 AM, Mickey Spiegel <[email protected]> wrote:
> > On Thu, Apr 20, 2017 at 6:32 PM, YAMAMOTO Takashi <[email protected]> > wrote: > >> NetBSD implementation of wc command outputs extra whitespaces >> like the following. Tweak the test to success on such environments. >> >> % echo hoge|wc -l|hexdump -C >> 00000000 20 20 20 20 20 20 20 31 0a | >> 1.| >> 00000009 >> % >> >> The failing test was introduced by >> commit 41a15b71ed1ef35aa612a1128082219fbfc3f327 >> (ovn: Introduce distributed gateway port and "chassisredirect" port >> binding) >> >> Signed-off-by: YAMAMOTO Takashi <[email protected]> >> > > There are three more in one of the tests in system-ovn.at, affecting make > check-kernel. > sure. but those tests seem heavily linux-centric anyway for other reasons. > > Acked-by: Mickey Spiegel <[email protected]> > > > >> --- >> tests/ovn.at | 18 ++++++------------ >> 1 file changed, 6 insertions(+), 12 deletions(-) >> >> diff --git a/tests/ovn.at b/tests/ovn.at >> index af77c19..1bffc4c 100644 >> --- a/tests/ovn.at >> +++ b/tests/ovn.at >> @@ -6567,20 +6567,14 @@ as hv3 ovs-ofctl dump-flows br-int >> echo "--------------------------" >> >> # Check that redirect mapping is programmed only on hv2 >> -AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=33 | grep >> =0x3,metadata=0x1 | wc -l], [0], [0 >> -]) >> -AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=33 | grep >> =0x3,metadata=0x1 | grep load:0x2- | wc -l], [0], [1 >> -]) >> +AT_CHECK([test `as hv1 ovs-ofctl dump-flows br-int table=33 | grep >> =0x3,metadata=0x1 | wc -l` -eq 0]) >> +AT_CHECK([test `as hv2 ovs-ofctl dump-flows br-int table=33 | grep >> =0x3,metadata=0x1 | grep load:0x2- | wc -l` -eq 1]) >> # Check that hv1 sends chassisredirect port traffic to hv2 >> -AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=32 | grep >> =0x3,metadata=0x1 | grep output | wc -l], [0], [1 >> -]) >> -AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=32 | grep >> =0x3,metadata=0x1 | wc -l], [0], [0 >> -]) >> +AT_CHECK([test `as hv1 ovs-ofctl dump-flows br-int table=32 | grep >> =0x3,metadata=0x1 | grep output | wc -l` -eq 1]) >> +AT_CHECK([test `as hv2 ovs-ofctl dump-flows br-int table=32 | grep >> =0x3,metadata=0x1 | wc -l` -eq 0]) >> # Check that arp reply on distributed gateway port is only programmed on >> hv2 >> -AT_CHECK([as hv1 ovs-ofctl dump-flows br-int | grep arp | grep >> =0x2,metadata=0x1 | wc -l], [0], [0 >> -]) >> -AT_CHECK([as hv2 ovs-ofctl dump-flows br-int | grep arp | grep >> =0x2,metadata=0x1 | wc -l], [0], [1 >> -]) >> +AT_CHECK([test `as hv1 ovs-ofctl dump-flows br-int | grep arp | grep >> =0x2,metadata=0x1 | wc -l` -eq 0]) >> +AT_CHECK([test `as hv2 ovs-ofctl dump-flows br-int | grep arp | grep >> =0x2,metadata=0x1 | wc -l` -eq 1]) >> >> >> ip_to_hex() { >> -- >> 2.5.4 (Apple Git-61) >> >> _______________________________________________ >> dev mailing list >> [email protected] >> https://mail.openvswitch.org/mailman/listinfo/ovs-dev >> > > _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
