X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Flinking%2Ftest_linking;h=2b8e0b06c1529bd91084fcd739f77659cc78f500;hb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;hp=77e0b82f2493a6c0ee0f404e557f91f69b6d55a4;hpb=91c7528576191398299e36d4ac061b8a0076a643;p=lttng-tools.git

diff --git a/tests/regression/ust/linking/test_linking b/tests/regression/ust/linking/test_linking
index 77e0b82f2..2b8e0b06c 100755
--- a/tests/regression/ust/linking/test_linking
+++ b/tests/regression/ust/linking/test_linking
@@ -1,35 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 #
-# Copyright (C) - 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+# Copyright (C) 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
 #
-# 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}/../../..
 
+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