X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_clock_override;h=0a44f5f288d5acf6e1f597295c298ccd83b6f14f;hb=HEAD;hp=4b185db89f7e4ef9808575b44cc237c7f7e16cc4;hpb=d0e263e7e628d2eba76c883ffc6fb92065e440c7;p=lttng-tools.git

diff --git a/tests/regression/kernel/test_clock_override b/tests/regression/kernel/test_clock_override
index 4b185db89..c3688d359 100755
--- a/tests/regression/kernel/test_clock_override
+++ b/tests/regression/kernel/test_clock_override
@@ -64,8 +64,8 @@ function extract_clock_metadata_token()
 
 function test_clock_override_metadata()
 {
-	local ctf_metadata_file=$(mktemp -p $TRACE_PATH ctf-metadata.XXXXXX)
-	local clock_metadata_file=$(mktemp -p $TRACE_PATH clock-metadata.XXXXXX)
+	local ctf_metadata_file=$(TMPDIR="$TRACE_PATH" mktemp -t ctf-metadata.XXXXXX)
+	local clock_metadata_file=$(TMPDIR="$TRACE_PATH" mktemp -t clock-metadata.XXXXXX)
 	local result=""
 
 	diag "Clock override plugin metadata test"
@@ -149,7 +149,7 @@ function test_clock_override_timestamp()
 	destroy_lttng_session_ok $SESSION_NAME
 
 	stop_lttng_sessiond
-	modprobe --remove lttng-clock-plugin-test lttng-clock lttng-test
+	modprobe --remove lttng-test lttng-clock-plugin-test lttng-clock
 
 	# Use Babeltrace with "-n all" to give a comma separated list for
 	# easy extraction of timestamps.
@@ -164,6 +164,8 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
 TESTS=(
 	"test_clock_override_metadata"
 	"test_clock_override_timestamp"
@@ -172,19 +174,14 @@ TESTS=(
 TEST_COUNT=${#TESTS[@]}
 i=0
 
-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
 	trap signal_cleanup SIGTERM SIGINT
 
 	while [ "$i" -lt "$TEST_COUNT" ]; do
 
-		TRACE_PATH=$(mktemp -d)
+		TRACE_PATH=$(mktemp -d -t tmp.test_clock_override_trace_path.XXXXXX)
 
 		# Execute test
 		${TESTS[$i]}