plugin: Make sdb_plugin_info_t public.

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

diff --git a/t/integration/test_lib.sh b/t/integration/test_lib.sh
index 6386b205f467d45052d686e02d210d960ca71f44..63be63beef326ded85f739040d6542785838ab41 100644 (file)
--- a/t/integration/test_lib.sh
+++ b/t/integration/test_lib.sh
@@ -30,14 +30,13 @@
 
 TOP_SRCDIR="$( readlink -f "$( dirname "$0" )/../.." )"
 TESTDIR="$( mktemp -d )"
-trap "rm -rf '$TESTDIR'" EXIT
+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"
@@ -49,10 +48,28 @@ SYSDBD_CONF="$TESTDIR/sysdbd.conf"
 SOCKET_FILE="$TESTDIR/sock"
 PLUGIN_DIR="$TESTDIR"
 
-SYSDB="$MEMCHECK $TESTDIR/sysdb -U mockuser"
-SYSDBD="$MEMCHECK $TESTDIR/sysdbd"
+function run_sysdb() {
+       $MEMCHECK "$TESTDIR/sysdb" -U mockuser "$@"
+}
+
+function run_sysdbd() {
+       $MEMCHECK "$TESTDIR/sysdbd" "$@" &
+       SYSDBD_PID=$!
+}
+
+function run_sysdbd_foreground() {
+       $MEMCHECK "$TESTDIR/sysdbd" "$@"
+}
 
-export LD_PRELOAD=$TESTDIR/libsysdbclient.so:$TESTDIR/libsysdb.so
+function stop_sysdbd() {
+       if test -z $SYSDBD_PID; then
+               echo "Cannot stop sysdbd; PID unknown" >&2
+               exit 1
+       fi
+       kill $SYSDBD_PID
+       wait $SYSDBD_PID
+       SYSDBD_PID=''
+}
 
 function wait_for_sysdbd() {
        local i