index 482b8ae52c25710bfa5f29939aa5d159f76e9bd7..63be63beef326ded85f739040d6542785838ab41 100644 (file)
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 src/.libs/sysdb src/.libs/sysdbd "$TESTDIR"
-cp src/.libs/libsysdb*.so* "$TESTDIR"
-chrpath -r "$TESTDIR" "$TESTDIR/sysdb" > /dev/null
-chrpath -r "$TESTDIR" "$TESTDIR/sysdbd" > /dev/null
+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"
SOCKET_FILE="$TESTDIR/sock"
PLUGIN_DIR="$TESTDIR"
-SYSDB="$MEMCHECK $TESTDIR/sysdb"
-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" "$@"
+}
+
+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