projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: incorrect script name in python logging test
[lttng-tools.git]
/
tests
/
utils
/
utils.sh
diff --git
a/tests/utils/utils.sh
b/tests/utils/utils.sh
index 067a4f53224b71a93c536331466564ce78950484..4282fbb6983dfc6a42b412d8a636d9c6861a6204 100644
(file)
--- a/
tests/utils/utils.sh
+++ b/
tests/utils/utils.sh
@@
-138,12
+138,12
@@
function lttng_enable_kernel_syscall()
function lttng_enable_kernel_syscall_ok()
{
function lttng_enable_kernel_syscall_ok()
{
- lttng_enable_kernel_syscall 0
${*}
+ lttng_enable_kernel_syscall 0
"$@"
}
function lttng_enable_kernel_syscall_fail()
{
}
function lttng_enable_kernel_syscall_fail()
{
- lttng_enable_kernel_syscall 1
${*}
+ lttng_enable_kernel_syscall 1
"$@"
}
function lttng_disable_kernel_syscall()
}
function lttng_disable_kernel_syscall()
@@
-178,12
+178,12
@@
function lttng_disable_kernel_syscall()
function lttng_disable_kernel_syscall_ok()
{
function lttng_disable_kernel_syscall_ok()
{
- lttng_disable_kernel_syscall 0
${*}
+ lttng_disable_kernel_syscall 0
"$@"
}
function lttng_disable_kernel_syscall_fail()
{
}
function lttng_disable_kernel_syscall_fail()
{
- lttng_disable_kernel_syscall 1
${*}
+ lttng_disable_kernel_syscall 1
"$@"
}
function lttng_enable_kernel_channel()
}
function lttng_enable_kernel_channel()
@@
-204,12
+204,12
@@
function lttng_enable_kernel_channel()
function lttng_enable_kernel_channel_ok()
{
function lttng_enable_kernel_channel_ok()
{
- lttng_enable_kernel_channel 0
${*}
+ lttng_enable_kernel_channel 0
"$@"
}
function lttng_enable_kernel_channel_fail()
{
}
function lttng_enable_kernel_channel_fail()
{
- lttng_enable_kernel_channel 1
${*}
+ lttng_enable_kernel_channel 1
"$@"
}
function lttng_disable_kernel_channel()
}
function lttng_disable_kernel_channel()
@@
-230,12
+230,12
@@
function lttng_disable_kernel_channel()
function lttng_disable_kernel_channel_ok()
{
function lttng_disable_kernel_channel_ok()
{
- lttng_disable_kernel_channel 0
${*}
+ lttng_disable_kernel_channel 0
"$@"
}
function lttng_disable_kernel_channel_fail()
{
}
function lttng_disable_kernel_channel_fail()
{
- lttng_disable_kernel_channel 1
${*}
+ lttng_disable_kernel_channel 1
"$@"
}
function start_lttng_relayd
}
function start_lttng_relayd
@@
-711,8
+711,8
@@
function stop_lttng_tracing_fail ()
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=$?
@@
-724,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
@@
-732,13
+744,13
@@
function destroy_lttng_sessions ()
function lttng_snapshot_add_output ()
{
function lttng_snapshot_add_output ()
{
- local
sess_name
=$1
- local
trace_path
=$2
- local
expected_to_fail
=$3
+ local
expected_to_fail
=$1
+ local
sess_name
=$2
+ local
trace_path
=$3
$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name file://$trace_path >$OUTPUT_DEST
ret=$?
$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name file://$trace_path >$OUTPUT_DEST
ret=$?
- if [[ $expected_to_fail ]]; then
+ if [[ $expected_to_fail
-eq 1
]]; then
test "$ret" -ne "0"
ok $? "Failed to add a snapshot output file://$trace_path as expected"
else
test "$ret" -ne "0"
ok $? "Failed to add a snapshot output file://$trace_path as expected"
else
@@
-746,15
+758,25
@@
function lttng_snapshot_add_output ()
fi
}
fi
}
+function lttng_snapshot_add_output_ok ()
+{
+ lttng_snapshot_add_output 0 "$@"
+}
+
+function lttng_snapshot_add_output_fail ()
+{
+ lttng_snapshot_add_output 1 "$@"
+}
+
function lttng_snapshot_del_output ()
{
function lttng_snapshot_del_output ()
{
- local
sess_name
=$1
- local
id
=$2
- local
expected_to_fail
=$3
+ local
expected_to_fail
=$1
+ local
sess_name
=$2
+ local
id
=$3
$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot del-output -s $sess_name $id >$OUTPUT_DEST
ret=$?
$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot del-output -s $sess_name $id >$OUTPUT_DEST
ret=$?
- if [[ $expected_to_fail ]]; then
+ if [[ $expected_to_fail
-eq "1"
]]; then
test "$ret" -ne "0"
ok $? "Expect fail on deletion of snapshot output id $id"
else
test "$ret" -ne "0"
ok $? "Expect fail on deletion of snapshot output id $id"
else
@@
-762,6
+784,16
@@
function lttng_snapshot_del_output ()
fi
}
fi
}
+function lttng_snapshot_del_output_ok ()
+{
+ lttng_snapshot_del_output 0 "$@"
+}
+
+function lttng_snapshot_del_output_fail ()
+{
+ lttng_snapshot_del_output 1 "$@"
+}
+
function lttng_snapshot_record ()
{
local sess_name=$1
function lttng_snapshot_record ()
{
local sess_name=$1
This page took
0.02806 seconds
and
5
git commands to generate.