[lttng-dev] [PATCH lttng-tools] Fix: use start and stop sessiond from utils.sh

[Jonathan Rajotte]

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien at efficios.com>
---
 tests/regression/ust/daemon/test_daemon             | 18 +++++-------------
 tests/regression/ust/exit-fast/test_exit-fast       | 18 +++++-------------
 tests/regression/ust/fork/test_fork                 | 18 +++++-------------
 tests/regression/ust/libc-wrapper/test_libc-wrapper | 18 +++++-------------
 tests/regression/ust/linking/test_linking           | 18 +++++-------------
 5 files changed, 25 insertions(+), 65 deletions(-)

diff --git a/tests/regression/ust/daemon/test_daemon b/tests/regression/ust/daemon/test_daemon
index 54afd0c..13dda1b 100755
--- a/tests/regression/ust/daemon/test_daemon
+++ b/tests/regression/ust/daemon/test_daemon
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Copyright (C) - 2013 Jérémie Galarneau <jeremie.galarneau at efficios.com>
 #
@@ -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_daemon.py
 
-if [ $STOP_SESSIOND -ne 0 ]; then
-    kill `pidof lt-lttng-sessiond`
-fi
+stop_lttng_sessiond_notap
diff --git a/tests/regression/ust/exit-fast/test_exit-fast b/tests/regression/ust/exit-fast/test_exit-fast
index e8a0bd6..4b72171 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 <jeremie.galarneau at efficios.com>
 #
@@ -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
diff --git a/tests/regression/ust/fork/test_fork b/tests/regression/ust/fork/test_fork
index e05b556..3d0fb89 100755
--- a/tests/regression/ust/fork/test_fork
+++ b/tests/regression/ust/fork/test_fork
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Copyright (C) - 2013 Jérémie Galarneau <jeremie.galarneau at efficios.com>
 #
@@ -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_fork.py
 
-if [ $STOP_SESSIOND -ne 0 ]; then
-    kill `pidof lt-lttng-sessiond`
-fi
+stop_lttng_sessiond_notap
diff --git a/tests/regression/ust/libc-wrapper/test_libc-wrapper b/tests/regression/ust/libc-wrapper/test_libc-wrapper
index 8c6b128..14d227f 100755
--- a/tests/regression/ust/libc-wrapper/test_libc-wrapper
+++ b/tests/regression/ust/libc-wrapper/test_libc-wrapper
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Copyright (C) - 2013 Jérémie Galarneau <jeremie.galarneau at efficios.com>
 #
@@ -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_libc-wrapper.py
 
-if [ $STOP_SESSIOND -ne 0 ]; then
-    kill `pidof lt-lttng-sessiond`
-fi
+stop_lttng_sessiond_notap
diff --git a/tests/regression/ust/linking/test_linking b/tests/regression/ust/linking/test_linking
index 77e0b82..e630b09 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 at 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
-- 
2.1.4