X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fofproto-macros.at;h=24cb45a7dd9cfbeb23d0ce5fae5b85651cc3b1cf;hb=cdc5f488517d7f012df6ff01e70a58af3db332a6;hp=dc863e73f90b4bf632eabf914ffd3390a7c7caa1;hpb=01b389b1109fc667c37c1ace3bded423d9f38637;p=openvswitch diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at index dc863e73..24cb45a7 100644 --- a/tests/ofproto-macros.at +++ b/tests/ofproto-macros.at @@ -5,10 +5,10 @@ m4_define([TESTABLE_LOG], [-vPATTERN:ANY:'%c|%p|%m']) m4_define([OFPROTO_START], [OVS_RUNDIR=$PWD; export OVS_RUNDIR OVS_LOGDIR=$PWD; export OVS_LOGDIR - trap 'kill `cat ovs-openflowd.pid`' 0 - AT_CAPTURE_FILE([ovs-openflowd.log]) + trap 'kill `cat test-openflowd.pid`' 0 + AT_CAPTURE_FILE([test-openflowd.log]) AT_CHECK( - [ovs-openflowd --detach --pidfile --enable-dummy --log-file --fail=closed dummy@br0 none --datapath-id=fedcba9876543210 $1], + [test-openflowd --detach --pidfile --enable-dummy --log-file --fail=closed dummy@br0 none --datapath-id=fedcba9876543210 $1], [0], [], [stderr]) AT_CHECK([[sed < stderr ' /vlog|INFO|opened log file/d @@ -19,5 +19,5 @@ m4_define([OFPROTO_START], ]) m4_define([OFPROTO_STOP], - [AT_CHECK([ovs-appctl -t ovs-openflowd exit]) + [AT_CHECK([ovs-appctl -t test-openflowd exit]) trap '' 0])