X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fstress%2Ftest_multi_sessions_per_uid_5app_streaming;h=f8a0a4755d2723756a20e0ec4aa9a87ac7b995ba;hp=637624f66a087a8bac278d45ada03966ac787324;hb=fa3f8be960428e090b9576e3c67f0db33ed369d5;hpb=f0d43d3d8e0c7fcb01ba1550466517d047fd6e76

diff --git a/tests/stress/test_multi_sessions_per_uid_5app_streaming b/tests/stress/test_multi_sessions_per_uid_5app_streaming
index 637624f66..f8a0a4755 100755
--- a/tests/stress/test_multi_sessions_per_uid_5app_streaming
+++ b/tests/stress/test_multi_sessions_per_uid_5app_streaming
@@ -1,14 +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/..
@@ -70,8 +65,6 @@ function check_relayd()
 
 function start_sessiond()
 {
-	local SESSIOND_BIN="lttng-sessiond"
-
 	validate_kernel_version
 	if [ $? -ne 0 ]; then
 		fail "Start session daemon"
@@ -90,7 +83,6 @@ function start_sessiond()
 function start_relayd
 {
 	local opt=$1
-	local RELAYD_BIN="lttng-relayd"
 
 	if [ -z $(pgrep --full lt-$RELAYD_BIN) ]; then
 		$TESTDIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt >$LOG_FILE_RELAYD 2>&1 &
@@ -145,11 +137,10 @@ function sighandler()
 {
 	cleanup
 	rm $LOG_FILE_SESSIOND $LOG_FILE_RELAYD
-	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