X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fbefore-after%2Ftest_before_after;h=112f41a577b55b6c1e038efff28ba03a504d1da3;hb=c4fd489fe80828d8eaa1cca7f25ae87ebb6d77f5;hp=6d45bb5e7f2bfee9c933e93a27e22dd16122915f;hpb=6cb45b178e9b294bbbdc43a1078abdbee8137711;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 6d45bb5e7..112f41a57 100755
--- a/tests/regression/ust/before-after/test_before_after
+++ b/tests/regression/ust/before-after/test_before_after
@@ -35,50 +35,43 @@ fi
 
 # MUST set TESTDIR before calling those functions
 
-test_before_apps() {
+function test_before_apps()
+{
 	# BEFORE application is spawned
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
 	start_lttng_tracing $SESSION_NAME
 
 	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
-	ok $? "Start application to trace"
+	ok $? "Traced application stopped."
 
 	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
-	trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+	trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH
 
 	return $?
 }
 
-test_after_apps() {
+function test_after_apps()
+{
 	local out
 
-	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
-	ok $? "Start application to trace"
-
-	# BEFORE application is spawned
 	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."
+
 	start_lttng_tracing $SESSION_NAME
 
-	# At least hit one event
-	sleep 2
+	wait ${!}
 
 	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
-	out=$(babeltrace $TRACE_PATH | grep $EVENT_NAME | wc -l)
-	if [ $out -eq 0 ]; then
-		fail "Trace validation"
-		diag "No event(s) found. We are supposed to have at least one."
-		out=1
-	else
-		pass "Trace validation"
-		diag "Found $out event(s). Coherent."
-		out=0
-	fi
+	validate_trace $EVENT_NAME $TRACE_PATH
+	out=$?
 
 	return $out
 }
@@ -90,7 +83,7 @@ print_test_banner "$TEST_DESC"
 
 start_lttng_sessiond
 
-diag "Start application BEFORE tracing was started"
+diag "Start tracing BEFORE application is started"
 
 TRACE_PATH=$(mktemp -d)
 
@@ -103,7 +96,7 @@ fi
 
 rm -rf $TRACE_PATH
 
-diag "Start application AFTER tracing was started"
+diag "Start tracing AFTER application is started"
 
 TRACE_PATH=$(mktemp -d)