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 0cc1931770d15bb0b86a46c6a9f6ad23d3b479d1..9f501f6c3f7ccbf587c6637f6560074102486d87 100644 (file)
--- a/t/integration/test_lib.sh
+++ b/t/integration/test_lib.sh
@@ -33,8 +33,12 @@ 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"
 
+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"
 
@@ -50,8 +54,14 @@ SYSDBD_CONF="$TESTDIR/sysdbd.conf"
 SOCKET_FILE="$TESTDIR/sock"
 PLUGIN_DIR="$TESTDIR"
 
+SYSDB_USER="$( id -un )"
+
 function run_sysdb() {
-       $MEMCHECK "$TESTDIR/sysdb" -U mockuser "$@"
+       $MEMCHECK "$TESTDIR/sysdb" -U $SYSDB_USER "$@"
+}
+
+function run_sysdb_nouser() {
+       $MEMCHECK "$TESTDIR/sysdb" "$@"
 }
 
 function run_sysdbd() {
@@ -75,6 +85,9 @@ 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"; then
@@ -88,3 +101,4 @@ function wait_for_sysdbd() {
        fi
 }
 
+# vim: set tw=78 sw=4 ts=4 noexpandtab :