X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Fvalgrind_ust-consumerd.sh;h=7dd66681db666dfe689b1f4f72ab842c9a56dd75;hb=a5723f5808f5c93ef4ae20ed11523c97db0e6269;hp=5b348d7825a5b01a2adc54cbb3d250c585dbdbe4;hpb=4007533b5dfd45dbba9b3bb72031861845360fa6;p=ust.git

diff --git a/tests/valgrind_ust-consumerd.sh b/tests/valgrind_ust-consumerd.sh
index 5b348d7..7dd6668 100755
--- a/tests/valgrind_ust-consumerd.sh
+++ b/tests/valgrind_ust-consumerd.sh
@@ -25,7 +25,7 @@ source $TESTDIR/tap.sh
 starttest "ust-consumerd valgrind check"
 
 if ! which valgrind > /dev/null; then
-    echo "$0: Valgrind not found on the system." >/dev/stderr
+    echo "$0: Valgrind not found on the system." 1>&2
     exit 1;
 fi
 
@@ -45,6 +45,14 @@ VALG_OUT=/tmp/ust-testsuite-$USER-valg.txt
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$TESTDIR/../libustconsumer/.libs/"
 valgrind --suppressions=$TESTDIR/valgrind_suppress.txt -q $UST_CONSUMERD --pidfile "$pidfilepath" -o "$TRACE_DIR" >/dev/null 2>"$VALG_OUT" &
 VALG_PID=$!
+
+# Paranoid check that valgrind is alive or we will hang forever on the fifo
+if ! ps $VALG_PID > /dev/null; then
+    echo "Valgrind appears to have died, giving up"
+    rm $pidfilepath
+    exit
+fi
+
 UST_CONSUMERD_PID="$(<$pidfilepath)"
 
 okx $USTTRACE -L -s $TESTDIR/basic/.libs/basic
@@ -61,3 +69,5 @@ else
 	diag "$REPLY"
     done
 fi
+
+rm $pidfilepath