X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fbefore-after%2Ftest_before_after;h=66858517a6b38c2d7f18e7954d0f25c94e63b036;hb=f8ccb5c8e85ec0d0012f53a479ad66227141899a;hp=ed4981ba0f55d3f96cd6c5a3c559b96a0eb8f32b;hpb=c0684a0d75e6ec2dba9fd8608140681bbebf39cc;p=lttng-tools.git

diff --git a/tests/regression/ust/before-after/test_before_after b/tests/regression/ust/before-after/test_before_after
index ed4981ba0..66858517a 100755
--- a/tests/regression/ust/before-after/test_before_after
+++ b/tests/regression/ust/before-after/test_before_after
@@ -25,7 +25,7 @@ TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 SESSION_NAME="per-session"
 EVENT_NAME="tp:tptest"
-NUM_TESTS=17
+NUM_TESTS=16
 
 source $TESTDIR/utils/utils.sh
 
@@ -35,14 +35,6 @@ fi
 
 # MUST set TESTDIR before calling those functions
 
-function wait_app()
-{
-	while [ -n "$(pidof $TESTAPP_NAME)" ]; do
-		sleep 0.5
-	done
-	pass "Application $TESTAPP_NAME ended."
-}
-
 function test_before_apps()
 {
 	# BEFORE application is spawned
@@ -65,19 +57,15 @@ function test_after_apps()
 {
 	local out
 
+	create_lttng_session $SESSION_NAME $TRACE_PATH
+	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
+
 	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
 	ok $? "Application started in background."
 
-	# BEFORE application is spawned
-	create_lttng_session $SESSION_NAME $TRACE_PATH
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
 	start_lttng_tracing $SESSION_NAME
 
-	# Since the start is done after the application is started, there is a
-	# bootstrap time needed between the session daemon and the UST tracer.
-	# Waiting for the application to end tells us when to stop everything and
-	# validate that at least one event is seen.
-	wait_app
+	wait ${!}
 
 	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME