X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fhealth%2Ftest_health.sh;h=b4b416f929f7c5924611fda3f62f05ce91173104;hb=8d5a3312b34841f1ecba2605acad3eaca79fd5e4;hp=c59bab78239f2833c9887e741be7840099d4328f;hpb=e59fbef9052d7e79317edfe2f6af2efa95b79e96;p=lttng-tools.git

diff --git a/tests/regression/tools/health/test_health.sh b/tests/regression/tools/health/test_health.sh
index c59bab782..b4b416f92 100644
--- 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=99
+NUM_TESTS=96
 SLEEP_TIME=30
 
 source $TESTDIR/utils/utils.sh
@@ -154,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"
@@ -175,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\"."
@@ -214,7 +212,6 @@ NEEDS_ROOT=(
 	0
 	0
 	0
-	0
 	1
 
 	0
@@ -236,7 +233,6 @@ TEST_CONSUMERD=(
 	0
 	0
 	0
-	0
 
 	1
 	1
@@ -257,7 +253,6 @@ TEST_RELAYD=(
 	0
 	0
 	0
-	0
 
 	0
 	0
@@ -271,10 +266,10 @@ TEST_RELAYD=(
 	1
 )
 
-STDOUT_PATH=$(mktemp)
-STDERR_PATH=$(mktemp)
-TRACE_PATH=$(mktemp -d)
-HEALTH_PATH=$(mktemp -d)
+STDOUT_PATH=$(mktemp -t tmp.test_health_stdout_path.XXXXXX)
+STDERR_PATH=$(mktemp -t tmp.test_health_stderr_path.XXXXXX)
+TRACE_PATH=$(mktemp -d -t tmp.test_health_trace_path.XXXXXX)
+HEALTH_PATH=$(mktemp -d -t tmp.test_health_trace_path.XXXXXX)
 
 if [ "$(id -u)" == "0" ]; then
 	isroot=1