X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fmulti-session%2Ftest_multi_session;h=5a58515d53715f130a3ddab189882e463fec9a83;hb=HEAD;hp=ffe8355a8bfb351709713ceccdcac9bfa78e2c99;hpb=c1f5d7d5a1b8c6458abe26ce6912c292045ee2a7;p=lttng-tools.git

diff --git a/tests/regression/ust/multi-session/test_multi_session b/tests/regression/ust/multi-session/test_multi_session
index ffe8355a8..c0d1c307e 100755
--- a/tests/regression/ust/multi-session/test_multi_session
+++ b/tests/regression/ust/multi-session/test_multi_session
@@ -1,32 +1,21 @@
 #!/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 - Multi-session"
 
-CURDIR=$(dirname $0)/
+CURDIR=$(dirname "$0")/
 TESTDIR=$CURDIR/../../..
 NR_ITER=100
 SESSION_NAME="multi-session"
 EVENT_NAME="ust_gen_nevents:tptest"
 NUM_TESTS=28
 
+# shellcheck source=../../../utils/utils.sh
 source $TESTDIR/utils/utils.sh
 
-print_test_banner "$TEST_DESC"
-
 if [ ! -x "$CURDIR/gen-nevents" ]; then
 	BAIL_OUT "No UST nevents binary detected."
 fi
@@ -37,27 +26,23 @@ test_multi_session() {
 	local out
 
 	# BEFORE application is spawned
-	for i in `seq 0 3`; do
-		create_lttng_session "$SESSION_NAME-$i" "$TRACE_PATH/$i"
-		enable_ust_lttng_event "$SESSION_NAME-$i" "$EVENT_NAME$i"
-		start_lttng_tracing "$SESSION_NAME-$i"
+	for i in $(seq 0 3); do
+		create_lttng_session_ok "$SESSION_NAME-$i" "$TRACE_PATH/$i"
+		enable_ust_lttng_event_ok "$SESSION_NAME-$i" "$EVENT_NAME$i"
+		start_lttng_tracing_ok "$SESSION_NAME-$i"
 	done
 
-	./$CURDIR/gen-nevents $NR_ITER &
+	"./$CURDIR/gen-nevents" $NR_ITER &
 	ok $? "Start application to generate $NR_ITER events"
 
-	# At least hit one event
-	while [ -n "$(pidof gen-nevents)" ]; do
-		sleep 0.1
-	done
-
+	wait
 	pass "Wait for events to record"
 
-	for i in `seq 0 3`; do
-		stop_lttng_tracing "$SESSION_NAME-$i"
-		destroy_lttng_session "$SESSION_NAME-$i"
-		out=$(babeltrace "$TRACE_PATH/$i" | grep "$EVENT_NAMEi$i" | wc -l)
-		if [ $out -ne $NR_ITER ]; then
+	for i in $(seq 0 3); do
+		stop_lttng_tracing_ok "$SESSION_NAME-$i"
+		destroy_lttng_session_ok "$SESSION_NAME-$i"
+		out=$($BABELTRACE_BIN "$TRACE_PATH/$i" | grep -c "$EVENT_NAME$i")
+		if [ "$out" -ne $NR_ITER ]; then
 			fail "Trace validation of $SESSION_NAME-$i"
 			diag "No events found."
 			out=1
@@ -76,9 +61,11 @@ test_multi_session() {
 
 plan_tests $NUM_TESTS
 
+print_test_banner "$TEST_DESC"
+
 start_lttng_sessiond
 
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp -d -t tmp.test_multi_session_ust.XXXXXX)
 
 test_multi_session
 out=$?