X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fovsdb-monitor.at;h=31927671bead06767366575b99b7bfae2276f124;hb=2f47998baea215b996af0be4d1653032005e3ac4;hp=f0b20e155f9756a99f965d195e93d6d4e447436f;hpb=b12e3c41afaeb9faed1e3562954ec78fd595677d;p=openvswitch diff --git a/tests/ovsdb-monitor.at b/tests/ovsdb-monitor.at index f0b20e15..31927671 100644 --- a/tests/ovsdb-monitor.at +++ b/tests/ovsdb-monitor.at @@ -23,7 +23,7 @@ m4_define([OVSDB_CHECK_MONITOR], OVS_CHECK_LCOV([ovsdb-tool create db schema], [0], [stdout], [ignore]) m4_foreach([txn], [$3], [OVS_CHECK_LCOV([ovsdb-tool transact db 'txn'], [0], [ignore], [ignore])]) - AT_CHECK([ovsdb-server --detach --pidfile=$PWD/server-pid --listen=punix:socket --unixctl=$PWD/unixctl db], [0], [ignore], [ignore]) + AT_CHECK([ovsdb-server --detach --pidfile=$PWD/server-pid --remote=punix:socket --unixctl=$PWD/unixctl db], [0], [ignore], [ignore]) AT_CHECK([ovsdb-client --detach --pidfile=$PWD/client-pid monitor --format=csv unix:socket $4 > output], [0], [ignore], [ignore], [kill `cat server-pid`]) m4_foreach([txn], [$5], @@ -32,7 +32,7 @@ m4_define([OVSDB_CHECK_MONITOR], OVS_CHECK_LCOV([ovsdb-client transact unix:socket '[[]]'], [0], [ignore], [ignore], [kill `cat server-pid client-pid`]) AT_CHECK([ovs-appctl -t $PWD/unixctl -e exit], [0], [ignore], [ignore]) - OVS_WAIT_UNTIL([test ! -e server-pid && test ! -e client-pid && exit 0]) + OVS_WAIT_UNTIL([test ! -e server-pid && test ! -e client-pid]) AT_CHECK([perl $srcdir/uuidfilt.pl output], [0], [$6], [ignore]) AT_CLEANUP])