X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fmulti-session%2Ftest_multi_session;h=33b296bcf2b23b83a4a463af7577a5f01fc1dee0;hb=c28fcefd993b7539716bb5cd9557a08a217ec463;hp=ffe8355a8bfb351709713ceccdcac9bfa78e2c99;hpb=5d2e1e66a968d9e555f9b8b00d0589ebfaf3de32;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 ffe8355a8..33b296bcf 100755
--- a/tests/regression/ust/multi-session/test_multi_session
+++ b/tests/regression/ust/multi-session/test_multi_session
@@ -25,8 +25,6 @@ NUM_TESTS=28
 
 source $TESTDIR/utils/utils.sh
 
-print_test_banner "$TEST_DESC"
-
 if [ ! -x "$CURDIR/gen-nevents" ]; then
 	BAIL_OUT "No UST nevents binary detected."
 fi
@@ -38,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"
@@ -76,6 +70,8 @@ test_multi_session() {
 
 plan_tests $NUM_TESTS
 
+print_test_banner "$TEST_DESC"
+
 start_lttng_sessiond
 
 TRACE_PATH=$(mktemp -d)