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 2f64bd92943ba1d1c0c4b7fd68f9160e9e8ddfdc..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 ***"
-       rmmod lttng-test
        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()
@@ -93,12 +91,13 @@ function test_clock_override_metadata()
        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 -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")"
 
-       $BABELTRACE_BIN -o ctf-metadata -w $ctf_metadata_file $TRACE_PATH
+       $BABELTRACE_BIN -o ctf-metadata -w $ctf_metadata_file $TRACE_METADATA_DIR
        ok $? "Metadata extraction from babeltrace"
 
        extract_clock_metadata $ctf_metadata_file $clock_metadata_file