X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Flive%2Ftest_lttng_ust;h=06017d01d43e4ec17c1b5c546fe37c32ceac4101;hp=bf66603f6b878b22841258638ac64f22e21e67ed;hb=839cfeecde05d745592b67838942d611cff1fae4;hpb=96340a015194538227efcbc654ec02c2ed9961ce

diff --git a/tests/regression/tools/live/test_lttng_ust b/tests/regression/tools/live/test_lttng_ust
index bf66603f6..06017d01d 100755
--- a/tests/regression/tools/live/test_lttng_ust
+++ b/tests/regression/tools/live/test_lttng_ust
@@ -20,10 +20,6 @@ TEST_DESC="Live - User space tracing"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../../
-SESSIOND_BIN="lttng-sessiond"
-RELAYD_BIN="lttng-relayd"
-LTTNG_BIN="lttng"
-BABELTRACE_BIN="babeltrace"
 NR_ITER=1
 NR_USEC_WAIT=1
 DELAY_USEC=2000000
@@ -38,7 +34,7 @@ TRACE_PATH=$(mktemp -d)
 
 DIR=$(readlink -f $TESTDIR)
 
-NUM_TESTS=11
+NUM_TESTS=12
 
 source $TESTDIR/utils/utils.sh
 
@@ -69,7 +65,7 @@ function setup_live_tracing()
 function clean_live_tracing()
 {
 	stop_lttng_tracing_ok $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 }
 
 start_lttng_sessiond
@@ -87,6 +83,6 @@ rm -rf $TRACE_PATH
 stop_lttng_relayd
 
 test_custom_url
-pkill $RELAYD_BIN
 
+stop_lttng_relayd
 stop_lttng_sessiond