Commit 7f520eff authored by Matthieu Dorier's avatar Matthieu Dorier
Browse files

Merge branch 'master' of xgitlab.cels.anl.gov:sds/sds-keyval

parents dba88b73 bbf1e0ef
......@@ -134,6 +134,7 @@ if test "x${leveldb_backend}" == xyes ; then
CPPFLAGS="$LEVELDB_CFLAGS $CPPFLAGS"
CFLAGS="$LEVELDB_CFLAGS $CFLAGS"
SERVER_DEPS_PKG="${SERVER_DEPS_PKG} leveldb"
AC_DEFINE([USE_LEVELDB], 1, [use leveldb backend])
], [
# fall back to conventional tests if no pkgconfig
AC_CHECK_HEADERS([leveldb/c.h], ,
......
......@@ -35,7 +35,7 @@ function test_start_server ()
startwait=${1:-15}
maxtime=${2:-120}
run_to ${maxtime} bin/sdskv-server-daemon -f $TMPBASE/sdskv.addr na+sm ${@:3} &
run_to ${maxtime} bin/sdskv-server-daemon -f $TMPBASE/sdskv.addr ${SDSKV_TEST_TRANSPORT:-"na+sm"} ${@:3} &
# wait for server to start
sleep ${startwait}
......@@ -47,7 +47,7 @@ function test_start_custom_server ()
startwait=${1:-15}
maxtime=${2:-120}
run_to ${maxtime} test/sdskv-custom-server-daemon -f $TMPBASE/sdskv.addr na+sm ${@:3} &
run_to ${maxtime} test/sdskv-custom-server-daemon -f $TMPBASE/sdskv.addr ${SDSKV_TEST_TRANSPORT:-"na+sm"} ${@:3} &
# wait for server to start
sleep ${startwait}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment