X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Flinking%2Ftest_linking;fp=tests%2Fregression%2Fust%2Flinking%2Ftest_linking;h=e630b099357b193e1dcbe755ea2b1e60dc33aa9e;hp=77e0b82f2493a6c0ee0f404e557f91f69b6d55a4;hb=d82551ef082ff8c8130c61681a5ce57d503e2dc0;hpb=b8090274814e5f6a22cff0dd656e14769cc7a7df

diff --git a/tests/regression/ust/linking/test_linking b/tests/regression/ust/linking/test_linking
index 77e0b82f2..e630b0993 100755
--- a/tests/regression/ust/linking/test_linking
+++ b/tests/regression/ust/linking/test_linking
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Copyright (C) - 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
 #
@@ -14,22 +14,14 @@
 # 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=$?
-
 CURDIR=$(dirname $0)
 TESTDIR=${CURDIR}/../../..
 
+source $TESTDIR/utils/utils.sh
+
 # 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
+start_lttng_sessiond_notap
 
 python3 ${CURDIR}/test_linking.py
 
-if [ $STOP_SESSIOND -ne 0 ]; then
-    kill `pidof lt-lttng-sessiond`
-fi
+stop_lttng_sessiond_notap