projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lttng add-trigger: some updates to event rule to new syntax
[lttng-tools.git]
/
tests
/
utils
/
utils.sh
diff --git
a/tests/utils/utils.sh
b/tests/utils/utils.sh
index b17ba26ebe724326703a11cecac561f7d64eb989..6a9e1891d266cd890833feeec249d972ea97d772 100644
(file)
--- a/
tests/utils/utils.sh
+++ b/
tests/utils/utils.sh
@@
-1551,8
+1551,9
@@
function lttng_snapshot_del_output_fail ()
function lttng_snapshot_record ()
{
local sess_name=$1
function lttng_snapshot_record ()
{
local sess_name=$1
+ local trace_path=$2
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot record -s
$sess_name $trace_path
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"
}
@@
-2101,7
+2102,7
@@
function rotate_session_fail ()
function destructive_tests_enabled ()
{
function destructive_tests_enabled ()
{
- if [
${LTTNG_ENABLE_DESTRUCTIVE_TESTS}
= "will-break-my-system" ]; then
+ if [
"$LTTNG_ENABLE_DESTRUCTIVE_TESTS"
= "will-break-my-system" ]; then
return 0
else
return 1
return 0
else
return 1
@@
-2196,8
+2197,10
@@
function lttng_add_trigger()
local expected_to_fail="$1"
local trigger_name="$2"
shift 2
local expected_to_fail="$1"
local trigger_name="$2"
shift 2
+ local args=("$@")
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN add-trigger --id "$trigger_name" "$@" 1> /dev/null 2> /dev/null
+ diag "$TESTDIR/../src/bin/lttng/$LTTNG_BIN add-trigger --name $trigger_name ${args[*]}"
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN add-trigger --name "$trigger_name" "${args[@]}" 1> /dev/null 2> /dev/null
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
@@
-2211,7
+2214,9
@@
function lttng_remove_trigger()
{
local expected_to_fail="$1"
local trigger_name="$2"
{
local expected_to_fail="$1"
local trigger_name="$2"
+ shift 2
+ diag "$TESTDIR/../src/bin/lttng/$LTTNG_BIN remove-trigger $trigger_name"
$TESTDIR/../src/bin/lttng/$LTTNG_BIN remove-trigger "$trigger_name" 1> /dev/null 2> /dev/null
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
$TESTDIR/../src/bin/lttng/$LTTNG_BIN remove-trigger "$trigger_name" 1> /dev/null 2> /dev/null
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
This page took
0.024448 seconds
and
4
git commands to generate.