tests: invoke full_cleanup from script trap handlers, use modprobe -r

[lttng-tools.git] / tests / regression / kernel / test_clock_override

diff --git a/tests/regression/kernel/test_clock_override b/tests/regression/kernel/test_clock_override
index e19b77e1dc08868281ce7969e497032f223006e7..1fbba7717884ce60252a7bc770a6876268d1082f 100755 (executable)
--- a/tests/regression/kernel/test_clock_override
+++ b/tests/regression/kernel/test_clock_override
@@ -49,11 +49,9 @@ source $TESTDIR/utils/utils.sh
 function signal_cleanup()
 {
        diag "*** Exiting ***"
 function signal_cleanup()
 {
        diag "*** Exiting ***"

-       rmmod lttng-test

        stop_lttng_sessiond
        stop_lttng_sessiond

-       rmmod lttng-clock-plugin-test
-       rmmod lttng-clock
-       exit 1
+       modprobe -r lttng-test lttng-clock-plugin-test lttng-clock
+       full_cleanup

 }
 
 function extract_clock_metadata()
 }
 
 function extract_clock_metadata()


@@ -93,10 +91,8 @@ function test_clock_override_metadata()
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
 
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
 

-       rmmod lttng-test

        stop_lttng_sessiond
        stop_lttng_sessiond

-       rmmod lttng-clock-plugin-test
-       rmmod lttng-clock
+       modprobe -r 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")"
 
        local TRACE_METADATA_FILE_PATH="$(find "$TRACE_PATH" -name metadata -type f)"
        local TRACE_METADATA_DIR="$(dirname "$TRACE_METADATA_FILE_PATH")"