X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fbuffers-pid%2Ftest_buffers_pid;h=6fab526c111c88ec3a7d5a3e43c5f20e00566de7;hb=f8ccb5c8e85ec0d0012f53a479ad66227141899a;hp=2d227bf5f69fe98baf32a7ad70e59797b698de12;hpb=f5481aa9adff33804a2003baa1157043c35a1ccd;p=lttng-tools.git

diff --git a/tests/regression/ust/buffers-pid/test_buffers_pid b/tests/regression/ust/buffers-pid/test_buffers_pid
index 2d227bf5f..6fab526c1 100755
--- a/tests/regression/ust/buffers-pid/test_buffers_pid
+++ b/tests/regression/ust/buffers-pid/test_buffers_pid
@@ -66,10 +66,9 @@ test_after_multiple_apps() {
 	start_lttng_tracing $SESSION_NAME
 
 	for i in `seq 1 5`; do
-		$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT & >/dev/null 2>&1
+		$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1
 		ok $? "Start application $i for tracing"
 	done
-	wait_apps
 
 	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
@@ -145,17 +144,18 @@ test_before_app() {
 
 	diag "Start application BEFORE tracing is started"
 
-	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
-	ok $? "Start application to trace"
 
 	# BEFORE application is spawned
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 	enable_channel_per_pid $SESSION_NAME "channel0"
 	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
+
+	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
+	ok $? "Start application to trace"
+
 	start_lttng_tracing $SESSION_NAME
 
-	# At least hit one event
-	sleep 2
+	wait ${!}
 
 	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
@@ -171,8 +171,6 @@ test_before_app() {
 		out=0
 	fi
 
-	wait_apps
-
 	return $out
 }