Cleanup: use `modprobe --remove` rather than `rmmod`

[lttng-tools.git] / tests / regression / tools / notification / test_notification_kernel

diff --git a/tests/regression/tools/notification/test_notification_kernel b/tests/regression/tools/notification/test_notification_kernel
index 6d7f256aefbf0cdad30fe4a926ac098058905aa5..cece15f2608e1a8290366768e192f9e76df18fc8 100755 (executable)
--- a/tests/regression/tools/notification/test_notification_kernel
+++ b/tests/regression/tools/notification/test_notification_kernel
@@ -46,7 +46,7 @@ NUM_TESTS=104
 
 source $TESTDIR/utils/utils.sh
 
-function kernel_event_generator_toogle_state
+function kernel_event_generator_toggle_state
 {
        kernel_event_generator_suspended=$((kernel_event_generator_suspended==0))
 
@@ -55,8 +55,8 @@ function kernel_event_generator
 {
        state_file=$1
        kernel_event_generator_suspended=0
-       trap kernel_event_generator_toogle_state SIGUSR1
-       trap "exit" SIGTERM SIGINT EXIT
+       trap kernel_event_generator_toggle_state SIGUSR1
+
        while (true); do
                if [[ $kernel_event_generator_suspended -eq "1" ]]; then
                        touch $state_file
@@ -102,12 +102,13 @@ function kernel_test
        wait $APP_PID 2> /dev/null
 
 
-       rmmod lttng-test
+       modprobe --remove lttng-test
 
        rm -rf ${consumerd_pipe[@]} 2> /dev/null
 }
 
 if [ "$(id -u)" == "0" ]; then
+       validate_lttng_modules_present
        kernel_test
 else
        # Kernel tests are skipped.