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

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

diff --git a/tests/regression/kernel/test_rotation_destroy_flush b/tests/regression/kernel/test_rotation_destroy_flush
index 0b0b0ca7513399ef1acf6980e7f5f44a51eca9a8..03933a3af18e4079f8b1a6bfa9e28cc921a04376 100755 (executable)
--- a/tests/regression/kernel/test_rotation_destroy_flush
+++ b/tests/regression/kernel/test_rotation_destroy_flush
@@ -39,9 +39,8 @@ source $TESTDIR/utils/utils.sh
 function signal_cleanup()
 {
        diag "*** Exiting ***"
 function signal_cleanup()
 {
        diag "*** Exiting ***"

-       rmmod lttng-test
-       stop_lttng_sessiond
-       exit 1
+       modprobe -r lttng-test
+       full_cleanup

 }
 
 function enable_kernel_lttng_channel_size_limit ()
 }
 
 function enable_kernel_lttng_channel_size_limit ()


@@ -107,7 +106,7 @@ function test_rotation_destroy_flush_single()
 
        rm -rf $TRACE_PATH
 
 
        rm -rf $TRACE_PATH
 

-       rmmod lttng-test
+       modprobe -r lttng-test

        stop_lttng_sessiond
 }
 
        stop_lttng_sessiond
 }