X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_lttng_logger;h=849428807d944ce5787d68f4486dd41a0ad319be;hp=c0e2f71b4085f2723cf9a88fe20a6787125b6ca8;hb=HEAD;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33

diff --git a/tests/regression/kernel/test_lttng_logger b/tests/regression/kernel/test_lttng_logger
index c0e2f71b4..c6ed4f950 100755
--- a/tests/regression/kernel/test_lttng_logger
+++ b/tests/regression/kernel/test_lttng_logger
@@ -19,7 +19,7 @@ function test_proc_logger()
 {
 	diag "Test /proc/lttng-logger"
 
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
@@ -50,7 +50,7 @@ function test_dev_logger()
 {
 	diag "Test /dev/lttng-logger"
 
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
@@ -81,7 +81,7 @@ function test_payload_limit()
 {
 	diag "Test lttng-logger payload limit"
 
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
@@ -110,14 +110,9 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
-if [ "$(id -u)" == "0" ]; then
-	isroot=1
-else
-	isroot=0
-fi
-
-skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
+check_skip_kernel_test "$NUM_TESTS" "Skipping all tests." ||
 {
+	validate_lttng_modules_present
 	start_lttng_sessiond
 
 	test_proc_logger