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

diff --git a/tests/valgrind_ust-consumerd.sh b/tests/valgrind_ust-consumerd.sh
index d89a1f2..7dd6668 100755
--- a/tests/valgrind_ust-consumerd.sh
+++ b/tests/valgrind_ust-consumerd.sh
@@ -17,11 +17,6 @@
 #    You should have received a copy of the GNU General Public License
 #    along with LTTng-UST.  If not, see <http://www.gnu.org/licenses/>.
 
-if [ -n "$(which valgrind)" ]; then
-    echo "$0: Valgrind not found on the system." >/dev/stderr
-    exit 1;
-fi
-
 TESTDIR=$(dirname $0)
 
 source $TESTDIR/test_functions.sh
@@ -29,21 +24,38 @@ source $TESTDIR/tap.sh
 
 starttest "ust-consumerd valgrind check"
 
+if ! which valgrind > /dev/null; then
+    echo "$0: Valgrind not found on the system." 1>&2
+    exit 1;
+fi
+
 plan_tests 2
 
-TRACE_DIR="/tmp/ust-testsuite-ust-consumerdvalgrind-trace"
+TRACE_DIR="/tmp/ust-testsuite-$USER-ust-consumerdvalgrind-trace"
 rm -rf "$TRACE_DIR"
 mkdir "$TRACE_DIR"
 
 pidfilepath="/tmp/ust-testsuite-$USER-$(date +%Y%m%d%H%M%S%N)-ust-consumerd-pid"
 mkfifo -m 0600 "$pidfilepath"
 
-VALG_OUT=/tmp/ust-testsuite-valg.txt
-valgrind --suppressions=$TESTDIR/valgrind_suppress.txt -q ust-consumerd --pidfile "$pidfilepath" -o "$TRACE_DIR" >/dev/null 2>"$VALG_OUT" &
+UST_CONSUMERD="$TESTDIR/../ust-consumerd/.libs/ust-consumerd"
+USTTRACE="$TESTDIR/../usttrace"
+
+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 -s $TESTDIR/basic/.libs/basic
+okx $USTTRACE -L -s $TESTDIR/basic/.libs/basic
 
 kill -SIGTERM ${UST_CONSUMERD_PID}
 wait $!
@@ -54,6 +66,8 @@ if [ -z "$(<$VALG_OUT)" ]; then
 else
     fail "Valgrind found errors in ust-consumerd:"
     cat $VALG_OUT | while read; do
-	diag $REPLY
+	diag "$REPLY"
     done
 fi
+
+rm $pidfilepath