X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fofproto-macros.at;h=dc9bc8646e1a8182df8e0bbdd0a9dc5a158e2785;hb=f973f2af2fd4452c8e182caf6a4346cf2a2a394e;hp=658f30e4417c5472018a5f821de0391a19d6ff8f;hpb=01ca539f5c89fab1ea9a355d4cb75383dfb25da5;p=sliver-openvswitch.git diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at index 658f30e44..dc9bc8646 100644 --- a/tests/ofproto-macros.at +++ b/tests/ofproto-macros.at @@ -31,13 +31,14 @@ m4_define([TESTABLE_LOG], [-vPATTERN:ANY:'%c|%p|%m']) m4_define([OVS_VSWITCHD_START], [OVS_RUNDIR=`pwd`; export OVS_RUNDIR OVS_LOGDIR=`pwd`; export OVS_LOGDIR + OVS_DBDIR=`pwd`; export OVS_DBDIR OVS_SYSCONFDIR=`pwd`; export OVS_SYSCONFDIR trap 'kill `cat ovsdb-server.pid ovs-vswitchd.pid`' 0 dnl Create database. mkdir openvswitch touch openvswitch/.conf.db.~lock~ - AT_CHECK([ovsdb-tool create openvswitch/conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema]) + AT_CHECK([ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema]) dnl Start ovsdb-server. AT_CHECK([ovsdb-server --detach --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock], [0], [], [stderr])