X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Flow-throughput%2Ftest_low_throughput;h=4820485f7379adc45228d6f6e5e16865f00c670d;hp=2e111336e92a424088d7cc2d9b7f3c39b60d0180;hb=67b4c664e2c6c6dc19920555c0abf094ed6cbe00;hpb=e5be53a084ca2d0fd6540c6da59fa8909dfac8f8

diff --git a/tests/regression/ust/low-throughput/test_low_throughput b/tests/regression/ust/low-throughput/test_low_throughput
index 2e111336e..4820485f7 100755
--- a/tests/regression/ust/low-throughput/test_low_throughput
+++ b/tests/regression/ust/low-throughput/test_low_throughput
@@ -21,32 +21,34 @@ TESTDIR=$CURDIR/../../..
 BIN_NAME="gen-events"
 SESSION_NAME="low-throughput"
 EVENT_NAME="tp:slow"
+NUM_TESTS=8
 
 source $TESTDIR/utils/utils.sh
 
-print_test_banner "$TEST_DESC"
-
 if [ ! -x "$CURDIR/$BIN_NAME" ]; then
-	echo -e "No UST nevents binary detected. Passing."
-	exit 0
+	BAIL_OUT "No UST nevents binary detected."
 fi
 
 TRACE_PATH=$(mktemp -d)
 
 # MUST set TESTDIR before calling those functions
 
+plan_tests $NUM_TESTS
+
+print_test_banner "$TEST_DESC"
+
 start_lttng_sessiond
 
-create_lttng_session $SESSION_NAME $TRACE_PATH
+create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
-enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
-start_lttng_tracing $SESSION_NAME
+enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
+start_lttng_tracing_ok $SESSION_NAME
 
 # This is going to take 20 minutes
 ./$CURDIR/$BIN_NAME >/dev/null 2>&1
 
-stop_lttng_tracing $SESSION_NAME
-destroy_lttng_session $SESSION_NAME
+stop_lttng_tracing_ok $SESSION_NAME
+destroy_lttng_session_ok $SESSION_NAME
 
 stop_lttng_sessiond
 
@@ -65,7 +67,7 @@ do
 		((last_val++))
 		# We expect here a continous value from 1 to 20
 		if [ $last_val -ne $val ]; then
-			echo -n "[-] One minute event failed ($val) "
+			diag "One minute event failed ($val)"
 			out=1
 			break
 		fi
@@ -74,7 +76,7 @@ do
 		if [ $val -ne 10 ]; then
 			# Test 20 minutes counter
 			if [ $val -ne 20 ]; then
-				echo -n "[-] Ten minutes event failed ($val) "
+				diag "Ten minutes event failed ($val)"
 				out=1
 				break
 			fi
@@ -82,20 +84,13 @@ do
 	elif [ $th = '"twenty"' ]; then
 		# Test 20 minutes counter
 		if [ $val -ne 20 ]; then
-			echo -n "[-] Twenty minutes event failed ($val) "
+			diag "Twenty minutes event failed ($val)"
 			out=1
 			break
 		fi
 	fi
 done
 
-if [ $out -eq 0 ]; then
-	echo -n "Trace is coherent... "
-	print_ok
-else
-	print_fail
-fi
+ok $out "Trace validation"
 
 rm -rf $TRACE_PATH
-
-exit $out