X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_clock_override;h=9dcde73d821e2939ddb2efcf39370b71becca5af;hb=c125de8f5c0dc9ba3ada63e9317e468ffb9e335a;hp=741e782a3842956ba9fe474ba192bc6c7f3bdb4a;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git

diff --git a/tests/regression/kernel/test_clock_override b/tests/regression/kernel/test_clock_override
index 741e782a3..9dcde73d8 100755
--- a/tests/regression/kernel/test_clock_override
+++ b/tests/regression/kernel/test_clock_override
@@ -40,7 +40,7 @@ function signal_cleanup()
 {
 	diag "*** Exiting ***"
 	stop_lttng_sessiond
-	modprobe -r lttng-test lttng-clock-plugin-test lttng-clock
+	modprobe --remove lttng-test lttng-clock-plugin-test lttng-clock
 	full_cleanup
 }
 
@@ -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=$(mktemp --tmpdir -p $TRACE_PATH ctf-metadata.XXXXXX)
+	local clock_metadata_file=$(mktemp --tmpdir -p $TRACE_PATH clock-metadata.XXXXXX)
 	local result=""
 
 	diag "Clock override plugin metadata test"
@@ -82,7 +82,7 @@ function test_clock_override_metadata()
 	destroy_lttng_session_ok $SESSION_NAME
 
 	stop_lttng_sessiond
-	modprobe -r lttng-test lttng-clock-plugin-test lttng-clock
+	modprobe --remove lttng-test lttng-clock-plugin-test lttng-clock
 
 	local TRACE_METADATA_FILE_PATH="$(find "$TRACE_PATH" -name metadata -type f)"
 	local TRACE_METADATA_DIR="$(dirname "$TRACE_METADATA_FILE_PATH")"
@@ -130,7 +130,7 @@ function test_clock_override_timestamp()
 		cut -d, -f1 | uniq | wc -l)
 	test $unique_timestamps_count -gt 1
 	ok $? "Unique event timestamps without clock override: $unique_timestamps_count expect >1"
-	rmmod lttng-test
+	modprobe --remove lttng-test
 	stop_lttng_sessiond
 
 	# Test with clock override plugin.
@@ -148,10 +148,8 @@ function test_clock_override_timestamp()
 	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session_ok $SESSION_NAME
 
-	rmmod lttng-test
 	stop_lttng_sessiond
-	rmmod lttng-clock-plugin-test
-	rmmod lttng-clock
+	modprobe --remove lttng-clock-plugin-test lttng-clock lttng-test
 
 	# Use Babeltrace with "-n all" to give a comma separated list for
 	# easy extraction of timestamps.
@@ -166,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"
@@ -186,7 +186,7 @@ skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
 
 	while [ "$i" -lt "$TEST_COUNT" ]; do
 
-		TRACE_PATH=$(mktemp -d)
+		TRACE_PATH=$(mktemp --tmpdir -d tmp.test_clock_override_trace_path.XXXXXX)
 
 		# Execute test
 		${TESTS[$i]}