X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fovs-vsctl.at;h=8f8354ab16afefba8fa1a8dc9a0af883d05a6774;hb=ff8decf1a318b4a611cb08bb3f12833044e8a872;hp=6e968f060d92275b07d5d3ef42d170a59ebaf2fc;hpb=8419883d698965962e37b024cfb7f2f0ccba376f;p=openvswitch diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at index 6e968f06..8f8354ab 100644 --- a/tests/ovs-vsctl.at +++ b/tests/ovs-vsctl.at @@ -3,24 +3,8 @@ dnl dnl Creates an empty database in the current directory and then starts dnl an ovsdb-server on it for ovs-vsctl to connect to. m4_define([OVS_VSCTL_SETUP], - [OVS_CHECK_LCOV( - [SCHEMA=$abs_top_builddir/vswitchd/vswitch-idl.ovsschema - if test ! -e $SCHEMA; then - SCHEMA=$abs_top_srcdir/vswitchd/vswitch-idl.ovsschema - if test ! -e $SCHEMA; then - echo 'Failed to find vswitch-idl.ovsschema' - exit 1 - fi - fi - ovsdb-tool create db $SCHEMA], - [0], [stdout], [ignore]) - OVS_CHECK_LCOV( - [[ovsdb-tool transact db \ - '[{"op": "insert", - "table": "Open_vSwitch", - "row": {}}]']], - [0], [ignore], [ignore]) - AT_CHECK([ovsdb-server --detach --pidfile=$PWD/pid --listen=punix:socket --unixctl=$PWD/unixctl db >/dev/null 2>&1], [0], [ignore], [ignore])]) + [OVSDB_INIT([db]) + AT_CHECK([ovsdb-server --detach --pidfile=$PWD/pid --remote=punix:socket --unixctl=$PWD/unixctl db >/dev/null 2>&1], [0], [ignore], [ignore])]) dnl OVS_VSCTL_CLEANUP dnl