Fix: tests: test definitions arrays contain invalid data

[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 4a99c2ea41c65ade878c7b0abb5ae0a1ff96e002..01da978a92147c8b20a83e161db8873c1e3e8c9c 100644 (file)
--- a/tests/regression/tools/health/test_health.sh
+++ b/tests/regression/tools/health/test_health.sh
@@ -8,7 +8,7 @@ UST_EVENT_NAME="tp:tptest"
 KERNEL_EVENT_NAME="sched_switch"
 CHANNEL_NAME="testchan"
 HEALTH_CHECK_BIN="health_check"
-NUM_TESTS=106
+NUM_TESTS=96
 SLEEP_TIME=30
 
 source $TESTDIR/utils/utils.sh
@@ -124,9 +124,12 @@ 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 $KILL_SIGNAL
+               stop_lttng_relayd_cleanup $KILL_SIGNAL
+       fi
+
+       if [ ${test_consumerd} -eq 1 ]; then
+               stop_lttng_consumerd $KILL_SIGNAL
        fi
-       stop_lttng_consumerd $KILL_SIGNAL
        stop_lttng_sessiond $KILL_SIGNAL
 
        unset LTTNG_TESTPOINT_ENABLE
@@ -151,7 +154,6 @@ skip $foundobj "No shared object generated. Skipping all tests." $NUM_TESTS && e
 THREAD=("LTTNG_SESSIOND_THREAD_MANAGE_CLIENTS"
        "LTTNG_SESSIOND_THREAD_MANAGE_APPS"
        "LTTNG_SESSIOND_THREAD_REG_APPS"
-       "LTTNG_SESSIOND_THREAD_HT_CLEANUP"
        "LTTNG_SESSIOND_THREAD_APP_MANAGE_NOTIFY"
        "LTTNG_SESSIOND_THREAD_APP_REG_DISPATCH"
        "LTTNG_SESSIOND_THREAD_MANAGE_KERNEL"
@@ -172,7 +174,6 @@ ERROR_STRING=(
        "Thread \"Session daemon command\" is not responding in component \"sessiond\"."
        "Thread \"Session daemon application manager\" is not responding in component \"sessiond\"."
        "Thread \"Session daemon application registration\" is not responding in component \"sessiond\"."
-       "Thread \"Session daemon hash table cleanup\" is not responding in component \"sessiond\"."
        "Thread \"Session daemon application notification manager\" is not responding in component \"sessiond\"."
        "Thread \"Session daemon application registration dispatcher\" is not responding in component \"sessiond\"."
        "Thread \"Session daemon kernel\" is not responding in component \"sessiond\"."
@@ -211,7 +212,6 @@ NEEDS_ROOT=(
        0
        0
        0
-       0
        1
 
        0
@@ -233,7 +233,6 @@ TEST_CONSUMERD=(
        0
        0
        0
-       0
 
        1
        1
@@ -254,7 +253,6 @@ TEST_RELAYD=(
        0
        0
        0
-       0
 
        0
        0
@@ -268,10 +266,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