Cleanup: tests: name all temporary files to better identify leakage

[lttng-tools.git] / tests / regression / tools / health / test_health.sh

diff --git a/tests/regression/tools/health/test_health.sh b/tests/regression/tools/health/test_health.sh
index bc25caa5794d9c99be4a5f126117befd3b49220b..b3d6419d252cbb88bcebc38e58206d98905cfaf9 100644 (file)
--- a/tests/regression/tools/health/test_health.sh
+++ b/tests/regression/tools/health/test_health.sh
@@ -1,38 +1,18 @@
-# Copyright (C) - 2012 Christian Babeux <christian.babeux@efficios.com>
-# Copyright (C) - 2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+# Copyright (C) 2012 Christian Babeux <christian.babeux@efficios.com>
+# Copyright (C) 2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
 #
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License, version 2 only, as
-# published by the Free Software Foundation.
-#
-# This program 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 General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 51
-# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# SPDX-License-Identifier: GPL-2.0-only
 
 TESTDIR=${CURDIR}/../../..
-LTTNG_BIN="lttng"
 UST_EVENT_NAME="tp:tptest"
 KERNEL_EVENT_NAME="sched_switch"
 CHANNEL_NAME="testchan"
 HEALTH_CHECK_BIN="health_check"
-NUM_TESTS=90
+NUM_TESTS=99
 SLEEP_TIME=30
 
 source $TESTDIR/utils/utils.sh
 
-function lttng_create_session_uri
-{
-       # Create session with default path
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME \
-               -U net://localhost >/dev/null 2>&1
-       ok $? "Create session with default path"
-}
-
 function report_errors
 {
        test_thread_error_string="$1"
@@ -90,7 +70,7 @@ function test_health
        # Activate specific thread test
        export ${test_thread_name}_${test_suffix}=1
 
-       # Spawn sessiond with preload healthexit lib
+       # Spawn sessiond with preloaded testpoint override lib
        export LD_PRELOAD="$CURDIR/$SESSIOND_PRELOAD"
 
        diag "Start session daemon"
@@ -144,9 +124,13 @@ function test_health
        if [ ${test_relayd} -eq 1 ]; then
                # We may fail to stop relayd here, and this is OK, since
                # it may have been killed volountarily by testpoint.
-               stop_lttng_relayd_notap
+               stop_lttng_relayd_cleanup $KILL_SIGNAL
+       fi
+
+       if [ ${test_consumerd} -eq 1 ]; then
+               stop_lttng_consumerd $KILL_SIGNAL
        fi
-       stop_lttng_sessiond
+       stop_lttng_sessiond $KILL_SIGNAL
 
        unset LTTNG_TESTPOINT_ENABLE
        unset ${test_thread_name}_${test_suffix}
@@ -287,10 +271,10 @@ TEST_RELAYD=(
        1
 )
 
-STDOUT_PATH=$(mktemp)
-STDERR_PATH=$(mktemp)
-TRACE_PATH=$(mktemp -d)
-HEALTH_PATH=$(mktemp -d)
+STDOUT_PATH=$(mktemp --tmpdir tmp.test_health_stdout_path.XXXXXX)
+STDERR_PATH=$(mktemp --tmpdir tmp.test_health_stderr_path.XXXXXX)
+TRACE_PATH=$(mktemp --tmpdir -d tmp.test_health_trace_path.XXXXXX)
+HEALTH_PATH=$(mktemp --tmpdir -d tmp.test_health_trace_path.XXXXXX)
 
 if [ "$(id -u)" == "0" ]; then
        isroot=1