projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests: cleanup: rework trigger listing tests
[lttng-tools.git]
/
tests
/
stress
/
test_multi_sessions_per_uid_5app_streaming_kill_relayd
diff --git
a/tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd
b/tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd
index c699ac226d54ac8c486b977b4dab5edd5c8d3c89..c9a4576b63bbb63a6bef67fb5fcf22c3ff0a534e 100755
(executable)
--- a/
tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd
+++ b/
tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd
@@
-1,14
+1,9
@@
#!/bin/bash
#
#!/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/..
CURDIR=$(dirname $0)/
TESTDIR=$CURDIR/..
@@
-43,7
+38,7
@@
function enable_channel_per_uid()
function check_sessiond()
{
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!!!"
local str_date=$(date +%H%M%S-%d%m%Y)
diag "!!!The session daemon died unexpectedly!!!"
@@
-63,7
+58,7
@@
function start_sessiond()
BAIL_OUT "*** Kernel too old for session daemon tests ***"
fi
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
# 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
@@
-78,7
+73,7
@@
function start_relayd
{
local opt=$1
{
local opt=$1
- 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
$TESTDIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt >$LOG_FILE_RELAYD 2>&1 &
ok $? "Start lttng-relayd (opt: \"$opt\")"
fi
@@
-86,7
+81,7
@@
function start_relayd
function check_relayd()
{
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 "Relay daemon died. Starting it again"
local str_date=$(date +%H%M%S-%d%m%Y)
#diag "Relay daemon died. Starting it again"
@@
-144,11
+139,10
@@
function sighandler()
{
cleanup
#rm $LOG_FILE_SESSIOND $LOG_FILE_RELAYD
{
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
# Make sure we collect a coredump if possible.
ulimit -c unlimited
This page took
0.025004 seconds
and
4
git commands to generate.