integration: Use store::network in the query tests.

[sysdb.git] / t / integration / test_lib.sh

diff --git a/t/integration/test_lib.sh b/t/integration/test_lib.sh
index 604d2dffb02553a5cc66a09cf8a740f724ee032c..9f501f6c3f7ccbf587c6637f6560074102486d87 100644 (file)
--- a/t/integration/test_lib.sh
+++ b/t/integration/test_lib.sh
@@ -33,38 +33,48 @@ TESTDIR="$( mktemp -d )"
 trap "rm -rf '$TESTDIR'; test -z \$SYSDBD_PID || kill \$SYSDBD_PID" EXIT
 
 mkdir "$TESTDIR/backend"
+cp "$TOP_SRCDIR/t/integration/.libs/mock_timeseries.so" "$TESTDIR"
 cp "$TOP_SRCDIR/t/integration/.libs/mock_plugin.so" "$TESTDIR/backend"
 
-cp "$TOP_SRCDIR"/src/.libs/sysdb "$TESTDIR"
-cp "$TOP_SRCDIR"/src/.libs/sysdbd "$TESTDIR"
-cp "$TOP_SRCDIR"/src/.libs/libsysdb*.so* "$TESTDIR"
+mkdir "$TESTDIR/store"
+cp "$TOP_SRCDIR/src/plugins/store/.libs/network.so" "$TESTDIR/store"
+
+cp "$TOP_SRCDIR"/src/sysdb "$TESTDIR"
+cp "$TOP_SRCDIR"/src/sysdbd "$TESTDIR"
 
 MEMCHECK="valgrind --quiet --tool=memcheck --error-exitcode=1"
 MEMCHECK="$MEMCHECK --trace-children=yes"
 MEMCHECK="$MEMCHECK --track-fds=yes"
 MEMCHECK="$MEMCHECK --leak-check=full"
+MEMCHECK="$MEMCHECK --suppressions=$TOP_SRCDIR/t/valgrind.suppress"
+MEMCHECK="$MEMCHECK --gen-suppressions=all"
 
 SYSDBD_CONF="$TESTDIR/sysdbd.conf"
 
 SOCKET_FILE="$TESTDIR/sock"
 PLUGIN_DIR="$TESTDIR"
 
+SYSDB_USER="$( id -un )"
+
 function run_sysdb() {
-       LD_PRELOAD=$TESTDIR/libsysdbclient.so $MEMCHECK \
-               "$TESTDIR/sysdb" -U mockuser "$@"
+       $MEMCHECK "$TESTDIR/sysdb" -U $SYSDB_USER "$@"
+}
+
+function run_sysdb_nouser() {
+       $MEMCHECK "$TESTDIR/sysdb" "$@"
 }
 
 function run_sysdbd() {
-       LD_PRELOAD=$TESTDIR/libsysdb.so $MEMCHECK "$TESTDIR/sysdbd" "$@" &
+       $MEMCHECK "$TESTDIR/sysdbd" "$@" &
        SYSDBD_PID=$!
 }
 
 function run_sysdbd_foreground() {
-       LD_PRELOAD=$TESTDIR/libsysdb.so $MEMCHECK "$TESTDIR/sysdbd" "$@"
+       $MEMCHECK "$TESTDIR/sysdbd" "$@"
 }
 
 function stop_sysdbd() {
-       if test -z $SYSDBD_PID; then
+       if test -z "$SYSDBD_PID"; then
                echo "Cannot stop sysdbd; PID unknown" >&2
                exit 1
        fi
@@ -74,9 +84,13 @@ function stop_sysdbd() {
 }
 
 function wait_for_sysdbd() {
+       local socket="$SOCKET_FILE"
+       if test -n "$1"; then
+               socket="$1"
+       fi
        local i
        for (( i=0; i<10; i++ )); do
-               if test -e "$SOCKET_FILE"; then
+               if test -e "$socket"; then
                        break
                fi
                sleep 1
@@ -87,3 +101,4 @@ function wait_for_sysdbd() {
        fi
 }
 
+# vim: set tw=78 sw=4 ts=4 noexpandtab :