From d82551ef082ff8c8130c61681a5ce57d503e2dc0 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Thu, 17 Sep 2015 16:42:35 -0400 Subject: [PATCH] Fix: use start and stop sessiond from utils.sh MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau --- tests/regression/ust/daemon/test_daemon | 18 +++++------------- tests/regression/ust/exit-fast/test_exit-fast | 18 +++++------------- tests/regression/ust/fork/test_fork | 18 +++++------------- .../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 54afd0cdc..13dda1b8a 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 # @@ -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 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 diff --git a/tests/regression/ust/fork/test_fork b/tests/regression/ust/fork/test_fork index e05b5560d..3d0fb898f 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 # @@ -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 8c6b12826..14d227f29 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 # @@ -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 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 # @@ -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.34.1