#!/bin/bash
#
-# Copyright (C) - 2013 David Goulet <dgoulet@efficios.com>
+# Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
#
-# This library is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; version 2.1 of the License. details.
+# SPDX-License-Identifier: LGPL-2.1-only
#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
CURDIR=$(dirname $0)/
TESTDIR=$CURDIR/..
function check_sessiond()
{
- if [ -z "$(pgrep --full lt-lttng-sessiond)" ]; then
+ if [ -z "$(lttng_pgrep lt-lttng-sessiond)" ]; then
local str_date=$(date +%H%M%S-%d%m%Y)
diag "!!!The session daemon died unexpectedly!!!"
function check_relayd()
{
- if [ -z "$(pgrep --full lt-lttng-relayd)" ]; then
+ if [ -z "$(lttng_pgrep lt-lttng-relayd)" ]; then
local str_date=$(date +%H%M%S-%d%m%Y)
diag "!!!The relay daemon died unexpectedly!!!"
function start_sessiond()
{
- local SESSIOND_BIN="lttng-sessiond"
-
validate_kernel_version
if [ $? -ne 0 ]; then
fail "Start session daemon"
BAIL_OUT "*** Kernel too old for session daemon tests ***"
fi
- if [ -z $(pgrep --full lt-$SESSIOND_BIN) ]; then
+ if [ -z $(lttng_pgrep lt-$SESSIOND_BIN) ]; then
# We have to start it like this so the ulimit -c is used by this
# process. Also, we collect any error message printed out.
$TESTDIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --quiet --background --consumerd32-path="$TESTDIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$TESTDIR/../src/bin/lttng-consumerd/lttng-consumerd" >$LOG_FILE_SESSIOND 2>&1
function start_relayd
{
local opt=$1
- local RELAYD_BIN="lttng-relayd"
- if [ -z $(pgrep --full lt-$RELAYD_BIN) ]; then
+ if [ -z $(lttng_pgrep lt-$RELAYD_BIN) ]; then
$TESTDIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt >$LOG_FILE_RELAYD 2>&1 &
ok $? "Start lttng-relayd (opt: \"$opt\")"
fi
{
cleanup
rm $LOG_FILE_SESSIOND $LOG_FILE_RELAYD
- exit 1
+ full_cleanup
}
-trap sighandler SIGINT
-trap sighandler SIGTERM
+trap sighandler SIGINT SIGTERM
# Make sure we collect a coredump if possible.
ulimit -c unlimited