X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_all_events;h=dd6dab5e519c98ad64b82472e23b5e8e05497926;hb=3a1744008331a0604479d3d7461f77056fad3a64;hp=2e20888df3590e26c7d2298e3d5f703799497325;hpb=0159fa50ebb4c8ea0e34a24f99bc8f5cda298be4;p=lttng-tools.git

diff --git a/tests/regression/kernel/test_all_events b/tests/regression/kernel/test_all_events
index 2e20888df..dd6dab5e5 100755
--- a/tests/regression/kernel/test_all_events
+++ b/tests/regression/kernel/test_all_events
@@ -17,7 +17,7 @@ source $TESTDIR/utils/utils.sh
 
 function test_all_event()
 {
-	local TRACE_PATH=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_all_events_basic"
 
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
@@ -43,13 +43,7 @@ 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