frontend: Support custom SSL options for each listener.

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

diff --git a/t/integration/test_lib.sh b/t/integration/test_lib.sh
index 482b8ae52c25710bfa5f29939aa5d159f76e9bd7..9f501f6c3f7ccbf587c6637f6560074102486d87 100644 (file)
--- a/t/integration/test_lib.sh
+++ b/t/integration/test_lib.sh
@@ -30,33 +30,67 @@
 
 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_timeseries.so" "$TESTDIR"
 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
+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="$MEMCHECK $TESTDIR/sysdb"
-SYSDBD="$MEMCHECK $TESTDIR/sysdbd"
+SYSDB_USER="$( id -un )"
+
+function run_sysdb() {
+       $MEMCHECK "$TESTDIR/sysdb" -U $SYSDB_USER "$@"
+}
+
+function run_sysdb_nouser() {
+       $MEMCHECK "$TESTDIR/sysdb" "$@"
+}
+
+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 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
@@ -67,3 +101,4 @@ function wait_for_sysdbd() {
        fi
 }
 
+# vim: set tw=78 sw=4 ts=4 noexpandtab :