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

diff --git a/tests/regression/tools/health/test_health.sh b/tests/regression/tools/health/test_health.sh
index 8d8830b75..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=106
+NUM_TESTS=96
 SLEEP_TIME=30
 
 source $TESTDIR/utils/utils.sh
@@ -70,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"
@@ -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 -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