store: Store "data-store" information alongside metrics.

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

diff --git a/t/integration/test_lib.sh b/t/integration/test_lib.sh
index 63be63beef326ded85f739040d6542785838ab41..496c02f7f27ee1c72b9b7ac2ffc213912d80161a 100644 (file)
--- a/t/integration/test_lib.sh
+++ b/t/integration/test_lib.sh
@@ -42,6 +42,8 @@ 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"
 
@@ -62,7 +64,7 @@ function run_sysdbd_foreground() {
 }
 
 function stop_sysdbd() {
-       if test -z $SYSDBD_PID; then
+       if test -z "$SYSDBD_PID"; then
                echo "Cannot stop sysdbd; PID unknown" >&2
                exit 1
        fi
@@ -72,9 +74,13 @@ function stop_sysdbd() {
 }
 
 function wait_for_sysdbd() {
+       local socket="$SOCKET_FILE"
        local i
+       if test -n "$1"; then
+               socket="$1"
+       fi
        for (( i=0; i<10; i++ )); do
-               if test -e "$SOCKET_FILE"; then
+               if test -e "$socket"; then
                        break
                fi
                sleep 1