X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fofproto.at;h=95067561c4dfa5d988d9d57af2d67ce27892c93c;hb=1cc618c32524076d14ba3ee30e672a554b8ee605;hp=a7dda06f01af026d5ef146d945a7cf02bb0bd51f;hpb=3b62feba9839bc341770ac7540976e6afd7d905b;p=openvswitch

diff --git a/tests/ofproto.at b/tests/ofproto.at
index a7dda06f..95067561 100644
--- a/tests/ofproto.at
+++ b/tests/ofproto.at
@@ -1,22 +1,5 @@
 AT_BANNER([ofproto])
 
-m4_define([STRIP_XIDS], [[sed 's/ (xid=0x[0-9a-fA-F]*)//']])
-m4_define([STRIP_DURATION], [[sed 's/\bduration=[0-9.]*s/duration=?s/']])
-
-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])
-   AT_CHECK(
-     [ovs-openflowd --detach --pidfile --enable-dummy --log-file dummy@br0 none --datapath-id=fedcba9876543210 $1],
-     [0], [ignore], [ignore])
-])
-
-m4_define([OFPROTO_STOP],
-  [AT_CHECK([ovs-appctl -t ovs-openflowd exit])
-   trap '' 0])
-
 AT_SETUP([ofproto - echo request])
 OFPROTO_START
 AT_CHECK([ovs-ofctl -vANY:ANY:WARN probe br0])
@@ -63,7 +46,7 @@ AT_SETUP([ofproto - basic flow_mod commands])
 OFPROTO_START
 AT_CHECK([ovs-ofctl dump-flows br0 | STRIP_XIDS], [0], [NXST_FLOW reply:
 ])
-AT_CHECK([ovs-ofctl add-flow br0 in_port=1,actions=0])
+AT_CHECK([echo 'in_port=1,actions=0' | ovs-ofctl add-flows br0 -])
 AT_CHECK([ovs-ofctl add-flow br0 in_port=0,actions=1])
 AT_CHECK([ovs-ofctl dump-flows br0 | STRIP_XIDS | STRIP_DURATION], [0], [dnl
 NXST_FLOW reply: