X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fdaemon%2Ftest_daemon;h=cfe3f34712b4b921ce3e5c474289dc9ff9b77ef6;hb=c125de8f5c0dc9ba3ada63e9317e468ffb9e335a;hp=54afd0cdc55625e0207e2241928d423f34f17414;hpb=43c28d504aa8ff65609f915a04e212fb923cfeba;p=lttng-tools.git diff --git a/tests/regression/ust/daemon/test_daemon b/tests/regression/ust/daemon/test_daemon index 54afd0cdc..cfe3f3471 100755 --- a/tests/regression/ust/daemon/test_daemon +++ b/tests/regression/ust/daemon/test_daemon @@ -1,35 +1,16 @@ -#!/bin/sh +#!/bin/bash # -# Copyright (C) - 2013 Jérémie Galarneau +# Copyright (C) 2013 Jérémie Galarneau # -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License, version 2 only, as -# published by the Free Software Foundation. -# -# This program 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 General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 51 -# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -# Check for a running sessiond -`pidof lt-lttng-sessiond` -STOP_SESSIOND=$? +# SPDX-License-Identifier: GPL-2.0-only CURDIR=$(dirname $0) TESTDIR=${CURDIR}/../../.. -# Try to launch a sessiond before invoking the python test script -if [ $STOP_SESSIOND -ne 0 ]; then - DIR=$(readlink -f ${TESTDIR}) - ${DIR}/../src/bin/lttng-sessiond/lttng-sessiond --daemonize --quiet --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" -fi +source $TESTDIR/utils/utils.sh + +start_lttng_sessiond_notap python3 ${CURDIR}/test_daemon.py -if [ $STOP_SESSIOND -ne 0 ]; then - kill `pidof lt-lttng-sessiond` -fi +stop_lttng_sessiond_notap