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

[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 b4c5958b5703fd47d35481b6ce15c919c15681b2..cc6fc5816e0c512081b4e3ea0a499739d4fd072e 100755 (executable)
--- a/tests/regression/tools/notification/test_notification_kernel
+++ b/tests/regression/tools/notification/test_notification_kernel
@@ -18,8 +18,10 @@
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../../
 
+TMPDIR=$(mktemp -d)
+
 #This is needed since the testpoint create a pipe with the consumerd type suffixed
-TESTPOINT_BASE_PATH=$(readlink -f "$CURDIR/lttng.t_p_n")
+TESTPOINT_BASE_PATH=$(readlink -f "$TMPDIR/lttng.t_p_n")
 TESTPOINT_PIPE_PATH=$(mktemp -u "${TESTPOINT_BASE_PATH}.XXXXXX")
 TESTPOIT_ARGS="CONSUMER_PAUSE_PIPE_PATH=${TESTPOINT_PIPE_PATH} LTTNG_TESTPOINT_ENABLE=1"
 TESTPOINT=$(readlink -f ${CURDIR}/.libs/libpause_consumer.so)
@@ -28,7 +30,7 @@ TESTPOINT=$(readlink -f ${CURDIR}/.libs/libpause_consumer.so)
 TESTAPP_PATH="$TESTDIR/utils/testapp"
 TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
-TESTAPP_STATE_PATH=$(mktemp -u "$CURDIR/application_state.XXXXXXXXXX")
+TESTAPP_STATE_PATH=$(mktemp -u "$TMPDIR/application_state.XXXXXXXXXX")
 
 NR_ITER=-1
 NR_USEC_WAIT=5
@@ -54,7 +56,7 @@ function kernel_event_generator
        state_file=$1
        kernel_event_generator_suspended=0
        trap kernel_event_generator_toogle_state SIGUSR1
-       trap "exit" SIGTERM SIGINT EXIT
+
        while (true); do
                if [[ $kernel_event_generator_suspended -eq "1" ]]; then
                        touch $state_file
@@ -102,10 +104,11 @@ function kernel_test
 
        rmmod lttng-test
 
-       rm ${consumerd_pipe[@]} 2> /dev/null
+       rm -rf ${consumerd_pipe[@]} 2> /dev/null
 }
 
 if [ "$(id -u)" == "0" ]; then
+       validate_lttng_modules_present
        kernel_test
 else
        # Kernel tests are skipped.
@@ -115,3 +118,4 @@ fi
 
 # Just in case cleanup
 rm -rf $TRACE_PATH
+rm -rf $TMPDIR