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: rename on-event condition to event-rule-matches
[lttng-tools.git]
/
tests
/
regression
/
tools
/
trigger
/
test_remove_trigger_cli
diff --git
a/tests/regression/tools/trigger/test_remove_trigger_cli
b/tests/regression/tools/trigger/test_remove_trigger_cli
index 8a0f90a9e4049fad013132c2db73c72a890b814c..9a04687612acf39de3c3602b054ab026d4882543 100755
(executable)
--- a/
tests/regression/tools/trigger/test_remove_trigger_cli
+++ b/
tests/regression/tools/trigger/test_remove_trigger_cli
@@
-51,13
+51,13
@@
function list_triggers ()
function remove_trigger ()
{
function remove_trigger ()
{
- local
id
="$1"
- local test_name="remove trigger ${
id
}"
+ local
name
="$1"
+ local test_name="remove trigger ${
name
}"
- "${FULL_LTTNG_BIN}" remove-trigger "${
id
}" > "${tmp_stdout}" 2> "${tmp_stderr}"
+ "${FULL_LTTNG_BIN}" remove-trigger "${
name
}" > "${tmp_stdout}" 2> "${tmp_stderr}"
ok $? "${test_name}: exit code is 0"
ok $? "${test_name}: exit code is 0"
- diff -u <(echo "Removed trigger \`${
id
}\`.") "${tmp_stdout}"
+ diff -u <(echo "Removed trigger \`${
name
}\`.") "${tmp_stdout}"
ok $? "${test_name}: expected stdout"
diff -u /dev/null "${tmp_stderr}"
ok $? "${test_name}: expected stdout"
diff -u /dev/null "${tmp_stderr}"
@@
-68,11
+68,11
@@
function remove_trigger ()
start_lttng_sessiond_notap
# Add a few triggers
start_lttng_sessiond_notap
# Add a few triggers
-lttng_add_trigger_ok "ABC" --condition
on-event
aaa -u --filter 'p == 2' --action notify
-lttng_add_trigger_ok "DEF" --condition
on-event
-u -a --action notify
+lttng_add_trigger_ok "ABC" --condition
event-rule-matches
aaa -u --filter 'p == 2' --action notify
+lttng_add_trigger_ok "DEF" --condition
event-rule-matches
-u -a --action notify
cat > "${tmp_expected_stdout}" <<- EOF
cat > "${tmp_expected_stdout}" <<- EOF
--
id
: ABC
+-
name
: ABC
user id: ${uid}
condition: event rule hit
rule: aaa (type: tracepoint, domain: ust, filter: p == 2)
user id: ${uid}
condition: event rule hit
rule: aaa (type: tracepoint, domain: ust, filter: p == 2)
@@
-80,7
+80,7
@@
cat > "${tmp_expected_stdout}" <<- EOF
notify
errors: none
errors: none
notify
errors: none
errors: none
--
id
: DEF
+-
name
: DEF
user id: ${uid}
condition: event rule hit
rule: * (type: tracepoint, domain: ust)
user id: ${uid}
condition: event rule hit
rule: * (type: tracepoint, domain: ust)
@@
-94,7
+94,7
@@
list_triggers "two triggers left" "${tmp_expected_stdout}"
remove_trigger "ABC"
cat > "${tmp_expected_stdout}" <<- EOF
remove_trigger "ABC"
cat > "${tmp_expected_stdout}" <<- EOF
--
id
: DEF
+-
name
: DEF
user id: ${uid}
condition: event rule hit
rule: * (type: tracepoint, domain: ust)
user id: ${uid}
condition: event rule hit
rule: * (type: tracepoint, domain: ust)
This page took
0.025096 seconds
and
4
git commands to generate.