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

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

diff --git a/tests/regression/tools/notification/test_notification_ust b/tests/regression/tools/notification/test_notification_ust
index 8941e476d50b9e5730fc90633da412acc703ca28..ad8b0b021d8e0ce44b82a6b9cfbcf7f0cad04b39 100755 (executable)
--- a/tests/regression/tools/notification/test_notification_ust
+++ b/tests/regression/tools/notification/test_notification_ust
@@ -1,19 +1,8 @@
 #!/bin/bash
 #
 #!/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/../../../
 
 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")
 #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)
 
 
 TESTPOINT=$(readlink -f ${CURDIR}/.libs/libpause_consumer.so)
 
 


@@ -46,7 +34,7 @@ DIR=$(readlink -f $TESTDIR)
 
 source $TESTDIR/utils/utils.sh
 
 
 source $TESTDIR/utils/utils.sh
 

-function ust_event_generator_toogle_state
+function ust_event_generator_toggle_state

 {
        ust_event_generator_suspended=$((ust_event_generator_suspended==0))
 
 {
        ust_event_generator_suspended=$((ust_event_generator_suspended==0))
 


@@ -55,8 +43,8 @@ function ust_event_generator
 {
        state_file=$1
        ust_event_generator_suspended=0
 {
        state_file=$1
        ust_event_generator_suspended=0

-       trap ust_event_generator_toogle_state SIGUSR1
-       trap "exit" SIGTERM SIGINT
+       trap ust_event_generator_toggle_state SIGUSR1
+

        while (true); do
                if [[ $ust_event_generator_suspended -eq "1" ]]; then
                        touch $state_file
        while (true); do
                if [[ $ust_event_generator_suspended -eq "1" ]]; then
                        touch $state_file


@@ -65,7 +53,7 @@ function ust_event_generator
                        if [[ -f $state_file ]]; then
                                rm -rf $state_file 2> /dev/null
                        fi
                        if [[ -f $state_file ]]; then
                                rm -rf $state_file 2> /dev/null
                        fi

-                       taskset  -c 0 $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT > /dev/null 2>&1
+                       taskset  -c 0 $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT > /dev/null 2>&1

                fi
        done
 }
                fi
        done
 }