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
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}"
}
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