X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fmulti-session%2Ftest_multi_session;h=33b296bcf2b23b83a4a463af7577a5f01fc1dee0;hb=9f35c1ad255b65e97d196033a1d7ca6e123a8006;hp=313a7d70fa9c408d529d4fca80a2a56d5c0233d2;hpb=e3bef7256ce348cf232ede3f36721e661cfda2a7;p=lttng-tools.git

diff --git a/tests/regression/ust/multi-session/test_multi_session b/tests/regression/ust/multi-session/test_multi_session
index 313a7d70f..33b296bcf 100755
--- a/tests/regression/ust/multi-session/test_multi_session
+++ b/tests/regression/ust/multi-session/test_multi_session
@@ -36,24 +36,20 @@ test_multi_session() {
 
 	# BEFORE application is spawned
 	for i in `seq 0 3`; do
-		create_lttng_session "$SESSION_NAME-$i" "$TRACE_PATH/$i"
-		enable_ust_lttng_event "$SESSION_NAME-$i" "$EVENT_NAME$i"
-		start_lttng_tracing "$SESSION_NAME-$i"
+		create_lttng_session_ok "$SESSION_NAME-$i" "$TRACE_PATH/$i"
+		enable_ust_lttng_event_ok "$SESSION_NAME-$i" "$EVENT_NAME$i"
+		start_lttng_tracing_ok "$SESSION_NAME-$i"
 	done
 
 	./$CURDIR/gen-nevents $NR_ITER &
 	ok $? "Start application to generate $NR_ITER events"
 
-	# At least hit one event
-	while [ -n "$(pidof gen-nevents)" ]; do
-		sleep 0.1
-	done
-
+	wait
 	pass "Wait for events to record"
 
 	for i in `seq 0 3`; do
-		stop_lttng_tracing "$SESSION_NAME-$i"
-		destroy_lttng_session "$SESSION_NAME-$i"
+		stop_lttng_tracing_ok "$SESSION_NAME-$i"
+		destroy_lttng_session_ok "$SESSION_NAME-$i"
 		out=$(babeltrace "$TRACE_PATH/$i" | grep "$EVENT_NAMEi$i" | wc -l)
 		if [ $out -ne $NR_ITER ]; then
 			fail "Trace validation of $SESSION_NAME-$i"