X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Flive%2Ftest_lttng_ust;h=7d6cc93f1b5692229105a9f2222365fa9cb920d7;hp=db63b4b8757ebead092a3ac6604665f1b951b3db;hb=67b4c664e2c6c6dc19920555c0abf094ed6cbe00;hpb=1a2416565951eff19530564c552931cc71866e8c

diff --git a/tests/regression/tools/live/test_lttng_ust b/tests/regression/tools/live/test_lttng_ust
index db63b4b87..7d6cc93f1 100755
--- a/tests/regression/tools/live/test_lttng_ust
+++ b/tests/regression/tools/live/test_lttng_ust
@@ -62,14 +62,14 @@ function setup_live_tracing()
 		-U net://localhost >/dev/null 2>&1
 	ok $? "Create session in live mode with delay $DELAY_USEC"
 
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
-	start_lttng_tracing $SESSION_NAME
+	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 }
 
 function clean_live_tracing()
 {
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 }
 
 start_lttng_sessiond
@@ -78,15 +78,11 @@ start_lttng_relayd "-o $TRACE_PATH"
 setup_live_tracing
 
 # Run app in background
-$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1 &
-# Wait for app to complete
-while [ -n "$(pidof $TESTAPP_NAME)" ]; do
-	sleep 0.5
-done
+$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1
 
 clean_live_tracing
 
-trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH
 rm -rf $TRACE_PATH
 stop_lttng_relayd