X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fhigh-throughput%2Ftest_high_throughput;h=10adc8ceb01d60e1eb19aadd2f7606c0caa182a7;hb=5da3fc8579a9f93ea4767729a107784bf2d034ae;hp=55060732873ae0022292aabf820bef30439abbdd;hpb=e5be53a084ca2d0fd6540c6da59fa8909dfac8f8;p=lttng-tools.git

diff --git a/tests/regression/ust/high-throughput/test_high_throughput b/tests/regression/ust/high-throughput/test_high_throughput
index 550607328..10adc8ceb 100755
--- a/tests/regression/ust/high-throughput/test_high_throughput
+++ b/tests/regression/ust/high-throughput/test_high_throughput
@@ -18,44 +18,43 @@ TEST_DESC="UST tracer - Testing high events throughput"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
-NR_ITER=20
+NR_APP=20
 BIN_NAME="gen-events"
 SESSION_NAME="high-throughput"
 EVENT_NAME="tp:tptest"
+NUM_TESTS=9
 
 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
 
-for i in `seq 1 $NR_ITER`; do
-	./$CURDIR/$BIN_NAME & >/dev/null 2>&1
+for i in `seq 1 $NR_APP`; do
+	./$CURDIR/$BIN_NAME >/dev/null 2>&1 &
 done
 
-echo "Waiting for applications to end"
-while [ -n "$(pidof $BIN_NAME)" ]; do
-	echo -n "."
-	sleep 0.5
-done
-echo ""
+diag "Waiting for applications to end"
+wait
+pass "Wait for applications to end"
 
-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
 
@@ -76,19 +75,15 @@ do
 done < $TEMP_FILE
 
 let total=$dropped+$traced
-let wanted=$NR_ITER*1000000
+let wanted=$NR_APP*1000000
 
 if [ $wanted -ne $total ]; then
-	echo -n "Expected $wanted. Dropped $dropped. Recorded $traced. Total $total... "
-	print_fail
-	out=1
+	fail "Trace validation"
+	diag "Expected $wanted. Dropped $dropped. Recorded $traced. Total $total"
 else
-	echo -n "Expected $wanted. Dropped $dropped. Recorded $traced. Total $total... "
-	print_ok
-	out=0
+	pass "Trace validation"
+	diag "Expected $wanted. Dropped $dropped. Recorded $traced. Total $total"
 fi
 
 rm -rf $TRACE_PATH
 rm $TEMP_FILE $TEMP_FILE_2
-
-exit $out