X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fofproto-macros.at;h=24cb45a7dd9cfbeb23d0ce5fae5b85651cc3b1cf;hb=ef8011eca397c13e572d159c3dfd12c4550d5d4d;hp=fabdb849ba64131610ce922d6a6014f1c656af82;hpb=35fe11834c85bf7fd86fa1a71f5415c2ca1d64d0;p=sliver-openvswitch.git

diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at
index fabdb849b..24cb45a7d 100644
--- a/tests/ofproto-macros.at
+++ b/tests/ofproto-macros.at
@@ -1,13 +1,14 @@
 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([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 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
@@ -18,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])