From: Ben Pfaff Date: Mon, 20 Aug 2012 17:30:05 +0000 (-0700) Subject: ofproto-dpif: Kill off test-netflow daemon if test fails. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bb1b69217c743116ff6f53eb40db8fe973659c0;p=openvswitch ofproto-dpif: Kill off test-netflow daemon if test fails. Signed-off-by: Ben Pfaff --- diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index 1e5856f2..cc5d770b 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -949,6 +949,7 @@ OVS_VSWITCHD_START( add-id-to-interface=false], [<0> ]) +ON_EXIT([kill `cat test-netflow.pid`]) AT_CHECK([test-netflow --detach --no-chdir --pidfile $NETFLOW_PORT:127.0.0.1 > netflow.log]) AT_CAPTURE_FILE([netflow.log]) @@ -993,6 +994,7 @@ OVS_VSWITCHD_START( add-id-to-interface=false], [<0> ]) +ON_EXIT([kill `test-netflow.pid`]) AT_CHECK([test-netflow --detach --no-chdir --pidfile $NETFLOW_PORT:127.0.0.1 > netflow.log])AT_CAPTURE_FILE([netflow.log]) AT_CHECK([ovs-appctl time/stop])