Fix: lttng: uninitialized pointer free'd when no sessiond is present

[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..81035b83108cdfe7b5f86dc654d6362e7366c320 100755 (executable)
--- a/tests/regression/tools/notification/test_notification_kernel
+++ b/tests/regression/tools/notification/test_notification_kernel
@@ -1,19 +1,8 @@
 #!/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/../../../
@@ -23,7 +12,6 @@ TMPDIR=$(mktemp -d)
 #This is needed since the testpoint create a pipe with the consumerd type suffixed
 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)
 
 
@@ -46,7 +34,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 +43,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
@@ -108,6 +96,7 @@ function kernel_test
 }
 
 if [ "$(id -u)" == "0" ]; then
+       validate_lttng_modules_present
        kernel_test
 else
        # Kernel tests are skipped.