projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: add base-path tests
[lttng-tools.git]
/
tests
/
utils
/
utils.sh
diff --git
a/tests/utils/utils.sh
b/tests/utils/utils.sh
index f2393b9cf69ea1370b65b1815b74c805e3a099ee..9ece4d35200af26bb476a667bc76df5e58b931d5 100644
(file)
--- a/
tests/utils/utils.sh
+++ b/
tests/utils/utils.sh
@@
-646,9
+646,9
@@
function stop_lttng_consumerd_opt()
if [ $withtap -eq "1" ]; then
diag "Killing $CONSUMERD_BIN pids: $(echo $PID_CONSUMERD | tr '\n' ' ')"
fi
if [ $withtap -eq "1" ]; then
diag "Killing $CONSUMERD_BIN pids: $(echo $PID_CONSUMERD | tr '\n' ' ')"
fi
+
kill $kill_opt $PID_CONSUMERD 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
retval=$?
kill $kill_opt $PID_CONSUMERD 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
retval=$?
- set +x
if [ $? -eq 1 ]; then
if [ $withtap -eq "1" ]; then
if [ $? -eq 1 ]; then
if [ $withtap -eq "1" ]; then
@@
-703,7
+703,6
@@
function sigstop_lttng_consumerd_opt()
fi
kill $kill_opt $PID_CONSUMERD 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
retval=$?
fi
kill $kill_opt $PID_CONSUMERD 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
retval=$?
- set +x
if [ $? -eq 1 ]; then
if [ $withtap -eq "1" ]; then
if [ $? -eq 1 ]; then
if [ $withtap -eq "1" ]; then
@@
-753,8
+752,9
@@
function list_lttng_with_opts ()
function create_lttng_session_no_output ()
{
local sess_name=$1
function create_lttng_session_no_output ()
{
local sess_name=$1
+ local opts="${@:2}"
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name --no-output 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name --no-output
$opts
1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ok $? "Create session $sess_name in no-output mode"
}
ok $? "Create session $sess_name in no-output mode"
}
@@
-1237,7
+1237,7
@@
function lttng_snapshot_add_output ()
local sess_name=$2
local trace_path=$3
local sess_name=$2
local trace_path=$3
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name
file://
$trace_path 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name $trace_path 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"
@@
-1288,7
+1288,7
@@
function lttng_snapshot_record ()
local sess_name=$1
local trace_path=$2
local sess_name=$1
local trace_path=$2
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot record -s $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot record -s $sess_name
$trace_path
1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ok $? "Snapshot recorded"
}
ok $? "Snapshot recorded"
}
@@
-1729,9
+1729,9
@@
function lttng_enable_rotation_timer ()
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 $? "Expected fail
on rotate
session $sess_name"
+ ok $? "Expected fail
when setting periodic rotation ($period) of
session $sess_name"
else
else
- ok $ret "
Rotate
session $sess_name"
+ ok $ret "
Set periodic rotation ($period) of
session $sess_name"
fi
}
fi
}
This page took
0.025454 seconds
and
4
git commands to generate.