X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Ftest_notification_kernel;h=990e8bc8da168edb1b71ae5717998f7fe3687ac6;hp=b4c5958b5703fd47d35481b6ce15c919c15681b2;hb=cb7237295335b181ac1959001e9e71aab7a19fdc;hpb=854382b8a0f18fa77ba97eac55a61dd8d8d8cc85

diff --git a/tests/regression/tools/notification/test_notification_kernel b/tests/regression/tools/notification/test_notification_kernel
index b4c5958b5..990e8bc8d 100755
--- a/tests/regression/tools/notification/test_notification_kernel
+++ b/tests/regression/tools/notification/test_notification_kernel
@@ -1,25 +1,16 @@
 #!/bin/bash
 #
-# Copyright (C) - 2017 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
+# Copyright (C) 2017 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
 #
-# This library is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+# SPDX-License-Identifier: LGPL-2.1-only
 
 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 +19,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
@@ -44,7 +35,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))
 
@@ -53,8 +44,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,10 +93,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 +107,4 @@ fi
 
 # Just in case cleanup
 rm -rf $TRACE_PATH
+rm -rf $TMPDIR