X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fexclusion%2Ftest_exclusion;h=b913994018311a779b56d0bbb261e4f845ba4da5;hb=b5b0c181b9f47edd4be6fd1f70835f232c0d56fd;hp=d093e1e1fe24b41d2b653b0e89c3854a148220a8;hpb=345121ec1049b7634d27b1ea304c1d57e765261f;p=lttng-tools.git

diff --git a/tests/regression/tools/exclusion/test_exclusion b/tests/regression/tools/exclusion/test_exclusion
index d093e1e1f..b91399401 100755
--- a/tests/regression/tools/exclusion/test_exclusion
+++ b/tests/regression/tools/exclusion/test_exclusion
@@ -28,7 +28,7 @@ TESTAPP_NAME="gen-ust-nevents"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 NR_ITER=100
 NR_USEC_WAIT=1
-NUM_TESTS=9
+NUM_TESTS=8
 
 source $TESTDIR/utils/utils.sh
 
@@ -44,15 +44,7 @@ function enable_ust_lttng_all_event_exclusion()
 
 function run_apps
 {
-	 $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1 &
-}
-
-function wait_apps
-{
-	while [ -n "$(pidof $BIN_NAME)" ]; do
-		sleep 1
-	done
-	pass "Wait for application end"
+	 $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1
 }
 
 function test_exclusion
@@ -60,18 +52,17 @@ function test_exclusion
 	trace_path=$(mktemp -d)
 
 	# Create session
-	create_lttng_session $SESSION_NAME $trace_path
+	create_lttng_session_ok $SESSION_NAME $trace_path
 
 	enable_ust_lttng_all_event_exclusion $SESSION_NAME $EV_EXCLUDE_NAME
 
 	# Trace apps
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 	run_apps
-	wait_apps
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	# Destroy session
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	stats=`babeltrace $trace_path | $STATS_BIN --tracepoint $EV_EXCLUDE_NAME | grep -v index`
 	if [ ! -z "$stats" ]; then