X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fstress%2Ftest_multi_sessions_per_uid_10app;h=4aaf1d91a43a0fe01bac3e927400947972017504;hp=bf611d20b3ecbdecc1e481adad39ed799bebe4aa;hb=b4b7369fbeb9c037449782132cfcdad1dac435d9;hpb=bf6ae429bc7bf2fefdce61e48806768dab7567d5

diff --git a/tests/stress/test_multi_sessions_per_uid_10app b/tests/stress/test_multi_sessions_per_uid_10app
index bf611d20b..4aaf1d91a 100755
--- a/tests/stress/test_multi_sessions_per_uid_10app
+++ b/tests/stress/test_multi_sessions_per_uid_10app
@@ -1,16 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) - 2013 David Goulet <dgoulet@efficios.com>
+# Copyright (C) 2013 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.
-# details.
+# SPDX-License-Identifier: LGPL-2.1-only
 #
-# 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
-
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/..
@@ -43,7 +36,7 @@ function enable_channel_per_uid()
 
 function check_sessiond()
 {
-	if [ -z "$(pidof lt-lttng-sessiond)" ]; then
+	if [ -z "$(lttng_pgrep lt-lttng-sessiond)" ]; then
 		local str_date=$(date +%H%M%S-%d%m%Y)
 
 		diag "!!!The session daemon died unexpectedly!!!"
@@ -57,15 +50,13 @@ function check_sessiond()
 
 function start_sessiond()
 {
-	local SESSIOND_BIN="lttng-sessiond"
-
 	validate_kernel_version
 	if [ $? -ne 0 ]; then
 		fail "Start session daemon"
 		BAIL_OUT "*** Kernel too old for session daemon tests ***"
 	fi
 
-	if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
+	if [ -z $(lttng_pgrep lt-$SESSIOND_BIN) ]; then
 		# We have to start it like this so the ulimit -c is used by this
 		# process. Also, we collect any error message printed out.
 		$TESTDIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --quiet --background --consumerd32-path="$TESTDIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$TESTDIR/../src/bin/lttng-consumerd/lttng-consumerd" >$LOG_FILE 2>&1
@@ -82,16 +73,16 @@ test_stress()
 			check_sessiond
 			enable_channel_per_uid $SESSION_NAME-$a $CHANNEL_NAME
 			check_sessiond
-			enable_ust_lttng_event $SESSION_NAME-$a $EVENT_NAME
+			enable_ust_lttng_event_ok $SESSION_NAME-$a $EVENT_NAME
 			check_sessiond
-			start_lttng_tracing $SESSION_NAME-$a
+			start_lttng_tracing_ok $SESSION_NAME-$a
 			check_sessiond
 		done
 
 		for a in $(seq 1 $NR_SESSION); do
-			stop_lttng_tracing $SESSION_NAME-$a
+			stop_lttng_tracing_ok $SESSION_NAME-$a
 			check_sessiond
-			destroy_lttng_session $SESSION_NAME-$a
+			destroy_lttng_session_ok $SESSION_NAME-$a
 			check_sessiond
 		done
 	done
@@ -114,11 +105,10 @@ function sighandler()
 {
 	cleanup
 	rm $LOG_FILE
-	exit 1
+	full_cleanup
 }
 
-trap sighandler SIGINT
-trap sighandler SIGTERM
+trap sighandler SIGINT SIGTERM
 
 # Make sure we collect a coredump if possible.
 ulimit -c unlimited