X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fregen-statedump%2Ftest_kernel;h=758b95d071efceea6974fa291aacd2fba6c95408;hb=HEAD;hp=92f584bbd25d354fb6b90ce80ce6b22cb9dac475;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git

diff --git a/tests/regression/tools/regen-statedump/test_kernel b/tests/regression/tools/regen-statedump/test_kernel
index 92f584bbd..758b95d07 100755
--- a/tests/regression/tools/regen-statedump/test_kernel
+++ b/tests/regression/tools/regen-statedump/test_kernel
@@ -12,7 +12,7 @@ EVENT_NAME="lttng_test_filter_event"
 SESSION_NAME=""
 EVENT_NAME="lttng_statedump_start,lttng_statedump_end"
 
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp -d -t tmp.test_regenerate_statedump_kernel_trace_path.XXXXXX)
 
 NUM_TESTS=11
 
@@ -39,13 +39,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 kernel streaming tests." $NUM_TESTS ||
+check_skip_kernel_test "$NUM_TESTS" "Skipping all tests." ||
 {
 	validate_lttng_modules_present
 	start_lttng_sessiond
@@ -59,6 +53,6 @@ skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_
 		${fct_test}
 	done
 
-	rmmod lttng-test
+	modprobe --remove lttng-test
 	stop_lttng_sessiond
 }