X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fexit-fast%2Ftest_exit-fast;fp=tests%2Fregression%2Fust%2Fexit-fast%2Ftest_exit-fast;h=4b7217116f20a71e917fc5ad5855c36de225eccc;hp=e8a0bd637dbc90005554d4aaf345b4407f11e466;hb=d82551ef082ff8c8130c61681a5ce57d503e2dc0;hpb=b8090274814e5f6a22cff0dd656e14769cc7a7df diff --git a/tests/regression/ust/exit-fast/test_exit-fast b/tests/regression/ust/exit-fast/test_exit-fast index e8a0bd637..4b7217116 100755 --- a/tests/regression/ust/exit-fast/test_exit-fast +++ b/tests/regression/ust/exit-fast/test_exit-fast @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Copyright (C) - 2013 Jérémie Galarneau # @@ -15,21 +15,13 @@ # 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=$? - 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_exit-fast.py -if [ $STOP_SESSIOND -ne 0 ]; then - kill `pidof lt-lttng-sessiond` -fi +stop_lttng_sessiond_notap