Merge 'next' into 'master'.

[openvswitch] / tests / ofproto-macros.at

diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at
index fabdb849ba64131610ce922d6a6014f1c656af82..3927550684e2d8e6e1377e3975c27fd86199b2c4 100644 (file)
--- a/tests/ofproto-macros.at
+++ b/tests/ofproto-macros.at
@@ -7,7 +7,7 @@ m4_define([OFPROTO_START],
    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],
+     [ovs-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