X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fregression%2Fust%2Ffork%2Ftest_fork;h=6e22af9351b56a1c743243235645c1a24e8eb711;hb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;hp=e05b5560dc85a7f0409e4533c4e4f6774606ce56;hpb=37bd6c8e4c4a3d7054d97627e4fb4bef1d4612a6;p=lttng-tools.git diff --git a/tests/regression/ust/fork/test_fork b/tests/regression/ust/fork/test_fork index e05b5560d..6e22af935 100755 --- a/tests/regression/ust/fork/test_fork +++ b/tests/regression/ust/fork/test_fork @@ -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_fork.py -if [ $STOP_SESSIOND -ne 0 ]; then - kill `pidof lt-lttng-sessiond` -fi +stop_lttng_sessiond_notap