X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fhealth%2Ftest_health.sh;h=23cb05075d33a0edabd2dd4a6060710e3d0dbbca;hb=HEAD;hp=4a99c2ea41c65ade878c7b0abb5ae0a1ff96e002;hpb=c89998b20ef1502466b1ac92fafbffcc25fd62f8;p=lttng-tools.git

diff --git a/tests/regression/tools/health/test_health.sh b/tests/regression/tools/health/test_health.sh
index 4a99c2ea4..23cb05075 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
@@ -82,7 +82,7 @@ function test_health
 		diag "With UST consumer daemons"
 		enable_ust_lttng_event_ok $SESSION_NAME $UST_EVENT_NAME $CHANNEL_NAME
 
-		skip $isroot "Root access is needed. Skipping kernel consumer health check test." "1" ||
+		check_skip_kernel_test "1" "Skipping kernel consumer health check test." ||
 		{
 			diag "With kernel consumer daemon"
 			lttng_enable_kernel_event $SESSION_NAME $KERNEL_EVENT_NAME $CHANNEL_NAME
@@ -113,7 +113,7 @@ function test_health
 
 
 	if [ ${test_needs_root} -eq 1 ]; then
-		skip ${isroot} "Root access needed for test \"${test_thread_name}\"." "1" ||
+		check_skip_kernel_test "1" "Skipping \"${test_thread_name}\"." ||
 		{
 			report_errors "${test_thread_error_string}" "${test_relayd}"
 		}
@@ -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,16 +266,10 @@ TEST_RELAYD=(
 	1
 )
 
-STDOUT_PATH=$(mktemp)
-STDERR_PATH=$(mktemp)
-TRACE_PATH=$(mktemp -d)
-HEALTH_PATH=$(mktemp -d)
-
-if [ "$(id -u)" == "0" ]; then
-	isroot=1
-else
-	isroot=0
-fi
+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)
 
 THREAD_COUNT=${#THREAD[@]}
 i=0