projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor: test: wrapper for destroy_lttng_session
[lttng-tools.git]
/
tests
/
utils
/
utils.sh
diff --git
a/tests/utils/utils.sh
b/tests/utils/utils.sh
index 12dabc52ccd87a9bbd17372511186198fdcd0790..454627eaae3ad6115b598f3067d1f81410899631 100644
(file)
--- a/
tests/utils/utils.sh
+++ b/
tests/utils/utils.sh
@@
-393,15
+393,15
@@
function create_lttng_session_fail ()
}
}
-function enable_ust_lttng_channel()
+function enable_ust_lttng_channel
()
{
{
- local
sess_name
=$1
- local
channel
_name=$2
- local
expect_fail
=$3
+ local
expect_fail
=$1
+ local
sess
_name=$2
+ local
channel_name
=$3
$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name >$OUTPUT_DEST
ret=$?
$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name >$OUTPUT_DEST
ret=$?
- if [[ $expect_fail ]]; then
+ if [[ $expect_fail
-eq "1"
]]; then
test "$ret" -ne "0"
ok $? "Expected fail on ust channel creation $channel_name in $sess_name"
else
test "$ret" -ne "0"
ok $? "Expected fail on ust channel creation $channel_name in $sess_name"
else
@@
-409,6
+409,16
@@
function enable_ust_lttng_channel()
fi
}
fi
}
+function enable_ust_lttng_channel_ok ()
+{
+ enable_ust_lttng_channel 0 "$@"
+}
+
+function enable_ust_lttng_channel_fail ()
+{
+ enable_ust_lttng_channel 1 "$@"
+}
+
function disable_ust_lttng_channel()
{
local sess_name=$1
function disable_ust_lttng_channel()
{
local sess_name=$1
@@
-438,10
+448,10
@@
function enable_lttng_mmap_overwrite_ust_channel()
function enable_ust_lttng_event ()
{
function enable_ust_lttng_event ()
{
- local
sess_name
=$1
- local
event_name="$2"
- local
channel_name=$3
- local
expected_to_fail
=$4
+ local
expected_to_fail
=$1
+ local
sess_name=$2
+ local
event_name="$3"
+ local
channel_name
=$4
if [ -z $channel_name ]; then
# default channel if none specified
if [ -z $channel_name ]; then
# default channel if none specified
@@
-452,7
+462,7
@@
function enable_ust_lttng_event ()
$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -u >$OUTPUT_DEST
ret=$?
$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -u >$OUTPUT_DEST
ret=$?
- if [[ $expected_to_fail ]]; then
+ if [[ $expected_to_fail
-eq "1"
]]; then
test $ret -ne "0"
ok $? "Enable ust event $event_name for session $session_name on channel $channel_name failed as expected"
else
test $ret -ne "0"
ok $? "Enable ust event $event_name for session $session_name on channel $channel_name failed as expected"
else
@@
-460,6
+470,16
@@
function enable_ust_lttng_event ()
fi
}
fi
}
+function enable_ust_lttng_event_ok ()
+{
+ enable_ust_lttng_event 0 "$@"
+}
+
+function enable_ust_lttng_event_fail ()
+{
+ enable_ust_lttng_event 1 "$@"
+}
+
function enable_jul_lttng_event()
{
sess_name=$1
function enable_jul_lttng_event()
{
sess_name=$1
@@
-641,12
+661,12
@@
function disable_python_lttng_event ()
function start_lttng_tracing ()
{
function start_lttng_tracing ()
{
- local
sess_name
=$1
- local
expected_to_fail
=$2
+ local
expected_to_fail
=$1
+ local
sess_name
=$2
$TESTDIR/../src/bin/lttng/$LTTNG_BIN start $sess_name >$OUTPUT_DEST
ret=$?
$TESTDIR/../src/bin/lttng/$LTTNG_BIN start $sess_name >$OUTPUT_DEST
ret=$?
- if [[ $expected_to_fail ]]; then
+ if [[ $expected_to_fail
-eq "1"
]]; then
test "$ret" -ne "0"
ok $? "Expected fail on start tracing for session: $sess_name"
else
test "$ret" -ne "0"
ok $? "Expected fail on start tracing for session: $sess_name"
else
@@
-654,14
+674,24
@@
function start_lttng_tracing ()
fi
}
fi
}
+function start_lttng_tracing_ok ()
+{
+ start_lttng_tracing 0 "$@"
+}
+
+function start_lttng_tracing_fail ()
+{
+ start_lttng_tracing 1 "$@"
+}
+
function stop_lttng_tracing ()
{
function stop_lttng_tracing ()
{
- local
sess_name
=$1
- local
expected_to_fail
=$2
+ local
expected_to_fail
=$1
+ local
sess_name
=$2
$TESTDIR/../src/bin/lttng/$LTTNG_BIN stop $sess_name >$OUTPUT_DEST
ret=$?
$TESTDIR/../src/bin/lttng/$LTTNG_BIN stop $sess_name >$OUTPUT_DEST
ret=$?
- if [[ $expected_to_fail ]]; then
+ if [[ $expected_to_fail
-eq "1"
]]; then
test "$ret" -ne "0"
ok $? "Expected fail on stop tracing for session: $sess_name"
else
test "$ret" -ne "0"
ok $? "Expected fail on stop tracing for session: $sess_name"
else
@@
-669,14
+699,24
@@
function stop_lttng_tracing ()
fi
}
fi
}
+function stop_lttng_tracing_ok ()
+{
+ stop_lttng_tracing 0 "$@"
+}
+
+function stop_lttng_tracing_fail ()
+{
+ stop_lttng_tracing 1 "$@"
+}
+
function destroy_lttng_session ()
{
function destroy_lttng_session ()
{
- local
sess_name
=$1
- local
expected_to_fail
=$2
+ local
expected_to_fail
=$1
+ local
sess_name
=$2
$TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy $sess_name >$OUTPUT_DEST
ret=$?
$TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy $sess_name >$OUTPUT_DEST
ret=$?
- if [[ $expected_to_fail ]]; then
+ if [[ $expected_to_fail
-eq "1"
]]; then
test "$ret" -ne "0"
ok $? "Expected fail on session deletion $sess_name"
else
test "$ret" -ne "0"
ok $? "Expected fail on session deletion $sess_name"
else
@@
-684,6
+724,18
@@
function destroy_lttng_session ()
fi
}
fi
}
+function destroy_lttng_session_ok ()
+{
+ destroy_lttng_session 0 "$@"
+
+}
+
+function destroy_lttng_session_fail ()
+{
+ destroy_lttng_session 1 "$@"
+}
+
+
function destroy_lttng_sessions ()
{
$TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy --all >$OUTPUT_DEST
function destroy_lttng_sessions ()
{
$TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy --all >$OUTPUT_DEST
This page took
0.031126 seconds
and
4
git commands to generate.