X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Fintegration%2Ftest_lib.sh;h=63be63beef326ded85f739040d6542785838ab41;hb=e48ff35c0684d772d4ba8bdc9f75dafcc0df6a36;hp=604d2dffb02553a5cc66a09cf8a740f724ee032c;hpb=63c6c74e57ae1f2b6133fbd20e31201f0a0d8612;p=sysdb.git diff --git a/t/integration/test_lib.sh b/t/integration/test_lib.sh index 604d2df..63be63b 100644 --- a/t/integration/test_lib.sh +++ b/t/integration/test_lib.sh @@ -35,9 +35,8 @@ trap "rm -rf '$TESTDIR'; test -z \$SYSDBD_PID || kill \$SYSDBD_PID" EXIT mkdir "$TESTDIR/backend" 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" +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" @@ -50,17 +49,16 @@ SOCKET_FILE="$TESTDIR/sock" PLUGIN_DIR="$TESTDIR" function run_sysdb() { - LD_PRELOAD=$TESTDIR/libsysdbclient.so $MEMCHECK \ - "$TESTDIR/sysdb" -U mockuser "$@" + $MEMCHECK "$TESTDIR/sysdb" -U mockuser "$@" } 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() {