projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sessiond: implement consumer clear channel
[lttng-tools.git]
/
tests
/
utils
/
utils.sh
diff --git
a/tests/utils/utils.sh
b/tests/utils/utils.sh
index 71ddaa2cb5ea5a5c0e814eb307d201dcb2189817..9df9a0bf0985fed35cdf2da8c9dc79cbbbef14b0 100644
(file)
--- a/
tests/utils/utils.sh
+++ b/
tests/utils/utils.sh
@@
-66,11
+66,24
@@
function full_cleanup ()
# The '-' before the pid number ($$) indicates 'kill' to signal the
# whole process group.
trap - SIGTERM && kill -- -$$
# The '-' before the pid number ($$) indicates 'kill' to signal the
# whole process group.
trap - SIGTERM && kill -- -$$
+ exit 1
}
}
+function null_pipes ()
+{
+ exec 0>/dev/null
+ exec 1>/dev/null
+ exec 2>/dev/null
+}
trap full_cleanup SIGINT SIGTERM
trap full_cleanup SIGINT SIGTERM
+# perl prove closes its child pipes before giving it a chance to run its
+# signal trap handlers. Redirect pipes to /dev/null if SIGPIPE is caught
+# to allow those trap handlers to proceed.
+
+trap null_pipes SIGPIPE
+
function print_ok ()
{
# Check if we are a terminal
function print_ok ()
{
# Check if we are a terminal
@@
-384,22
+397,23
@@
function lttng_disable_kernel_channel_fail()
function start_lttng_relayd_opt()
{
local withtap=$1
function start_lttng_relayd_opt()
{
local withtap=$1
- local opt=$2
+ local process_mode=$2
+ local opt=$3
DIR=$(readlink -f "$TESTDIR")
DIR=$(readlink -f "$TESTDIR")
- if [ -z
"$(pgrep "$RELAYD_MATCH")"
]; then
+ if [ -z
$(pgrep $RELAYD_MATCH)
]; then
# shellcheck disable=SC2086
# shellcheck disable=SC2086
-
"$DIR/../src/bin/lttng-relayd/$RELAYD_BIN" -b
$opt 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
- #
"$DIR/../src/bin/lttng-relayd/$RELAYD_BIN"
$opt -vvv >>/tmp/relayd.log 2>&1 &
+
$DIR/../src/bin/lttng-relayd/$RELAYD_BIN $process_mode
$opt 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
+ #
$DIR/../src/bin/lttng-relayd/$RELAYD_BIN
$opt -vvv >>/tmp/relayd.log 2>&1 &
if [ $? -eq 1 ]; then
if [ $? -eq 1 ]; then
- if [
"$withtap"
-eq "1" ]; then
- fail "Start lttng-relayd (opt: $opt)"
+ if [
$withtap
-eq "1" ]; then
+ fail "Start lttng-relayd (
process mode: $process_mode
opt: $opt)"
fi
return 1
else
fi
return 1
else
- if [
"$withtap"
-eq "1" ]; then
- pass "Start lttng-relayd (opt: $opt)"
+ if [
$withtap
-eq "1" ]; then
+ pass "Start lttng-relayd (
process mode: $process_mode
opt: $opt)"
fi
fi
else
fi
fi
else
@@
-409,12
+423,12
@@
function start_lttng_relayd_opt()
function start_lttng_relayd()
{
function start_lttng_relayd()
{
- start_lttng_relayd_opt 1 "$@"
+ start_lttng_relayd_opt 1 "
-b" "
$@"
}
function start_lttng_relayd_notap()
{
}
function start_lttng_relayd_notap()
{
- start_lttng_relayd_opt 0 "$@"
+ start_lttng_relayd_opt 0 "
-b" "
$@"
}
function stop_lttng_relayd_opt()
}
function stop_lttng_relayd_opt()
@@
-887,7
+901,14
@@
function create_lttng_session ()
local trace_path=$4
local opt=$5
local trace_path=$4
local opt=$5
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name -o $trace_path $opt > $OUTPUT_DEST
+ if [ -z "$trace_path" ]; then
+ # Use lttng-sessiond default output.
+ trace_path=""
+ else
+ trace_path="-o $trace_path"
+ fi
+
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN create "$sess_name" $trace_path $opt 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ret=$?
if [ $expected_to_fail -eq "1" ]; then
test "$ret" -ne "0"
ret=$?
if [ $expected_to_fail -eq "1" ]; then
test "$ret" -ne "0"
@@
-1348,14
+1369,15
@@
function lttng_snapshot_add_output ()
local expected_to_fail=$1
local sess_name=$2
local trace_path=$3
local expected_to_fail=$1
local sess_name=$2
local trace_path=$3
+ local opts=$4
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name $trace_path 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name $trace_path
$opts
1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ret=$?
if [[ $expected_to_fail -eq 1 ]]; then
test "$ret" -ne "0"
ret=$?
if [[ $expected_to_fail -eq 1 ]]; then
test "$ret" -ne "0"
- ok $? "Added snapshot output
file://
$trace_path failed as expected"
+ ok $? "Added snapshot output $trace_path failed as expected"
else
else
- ok $ret "Added snapshot output
file://
$trace_path"
+ ok $ret "Added snapshot output $trace_path"
fi
}
fi
}
@@
-1783,7
+1805,7
@@
function regenerate_statedump ()
test "$ret" -ne "0"
ok $? "Expected fail on regenerate statedump $sess_name"
else
test "$ret" -ne "0"
ok $? "Expected fail on regenerate statedump $sess_name"
else
- ok $ret "
Metadata
regenerate $sess_name"
+ ok $ret "
Statedump
regenerate $sess_name"
fi
}
fi
}
This page took
0.026421 seconds
and
4
git commands to generate.