X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_clock_override;h=bf1a21f2752900c28cc1f96249412af6be57d1a2;hb=962971d24e31ba0a82094e1786a2bfce124cc29f;hp=1fbba7717884ce60252a7bc770a6876268d1082f;hpb=16140bd25c5bd5eaf1a92dbdaa549600bbe10b1f;p=lttng-tools.git

diff --git a/tests/regression/kernel/test_clock_override b/tests/regression/kernel/test_clock_override
index 1fbba7717..bf1a21f27 100755
--- a/tests/regression/kernel/test_clock_override
+++ b/tests/regression/kernel/test_clock_override
@@ -50,7 +50,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
 }
 
@@ -92,7 +92,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")"
@@ -140,7 +140,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.
@@ -158,10 +158,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.