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

diff --git a/tests/regression/ust/low-throughput/test_low_throughput b/tests/regression/ust/low-throughput/test_low_throughput
index 2e111336e..e03d9f01e 100755
--- a/tests/regression/ust/low-throughput/test_low_throughput
+++ b/tests/regression/ust/low-throughput/test_low_throughput
@@ -1,19 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
+# Copyright (C) 2012 David Goulet <dgoulet@efficios.com>
 #
-# This library is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+# SPDX-License-Identifier: LGPL-2.1-only
+
 TEST_DESC="UST tracer - Testing low events throughput"
 
 CURDIR=$(dirname $0)/
@@ -21,32 +11,36 @@ 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)
+TRACE_PATH=$(mktemp --tmpdir -d tmp.test_low_throughput_ust_trace_path.XXXXXX)
 
 # MUST set TESTDIR before calling those functions
 
+plan_tests $NUM_TESTS
+
+print_test_banner "$TEST_DESC"
+
+bail_out_if_no_babeltrace
+
 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
 
@@ -55,7 +49,7 @@ stop_lttng_sessiond
 last_val=0
 out=0
 
-babeltrace $TRACE_PATH | while read event;
+"$BABELTRACE_BIN" $TRACE_PATH | while read event;
 do
 	val=$(echo $event | cut -f10 -d" ")
 	val=${val%?}
@@ -65,7 +59,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 +68,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 +76,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