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

diff --git a/tests/regression/tools/health/test_health.sh b/tests/regression/tools/health/test_health.sh
index f586a299d..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=99
+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}"
 		}
@@ -212,7 +212,6 @@ NEEDS_ROOT=(
 	0
 	0
 	0
-	0
 	1
 
 	0
@@ -234,7 +233,6 @@ TEST_CONSUMERD=(
 	0
 	0
 	0
-	0
 
 	1
 	1
@@ -255,7 +253,6 @@ TEST_RELAYD=(
 	0
 	0
 	0
-	0
 
 	0
 	0
@@ -269,16 +266,10 @@ TEST_RELAYD=(
 	1
 )
 
-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
-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