uid=$(id --user)
gid=$(id --group)
-function add_trigger ()
-{
- "${FULL_LTTNG_BIN}" add-trigger "$@"
- ok $? "add trigger \`$*\`: exit code is 0"
-}
-
function list_triggers ()
{
local test_name="$1"
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"
- 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}"
start_lttng_sessiond_notap
# Add a few triggers
-add_trigger --condition on-event -u -a --action notify
-add_trigger --id ABC --condition on-event aaa -u --filter 'p == 2' --action notify
+lttng_add_trigger_ok "ABC" --condition event-rule-matches --name=aaa --domain=user --filter 'p == 2' --action notify
+lttng_add_trigger_ok "DEF" --condition event-rule-matches --domain=user --action notify
cat > "${tmp_expected_stdout}" <<- EOF
-- id: ABC
- user id: ${uid}
+- name: ABC
+ owner uid: ${uid}
condition: event rule hit
rule: aaa (type: tracepoint, domain: ust, filter: p == 2)
actions:
notify
-- id: T0
- user id: ${uid}
+ errors: none
+ errors: none
+- name: DEF
+ owner uid: ${uid}
condition: event rule hit
rule: * (type: tracepoint, domain: ust)
actions:
notify
+ errors: none
+ errors: none
EOF
list_triggers "two triggers left" "${tmp_expected_stdout}"
remove_trigger "ABC"
cat > "${tmp_expected_stdout}" <<- EOF
-- id: T0
- user id: ${uid}
+- name: DEF
+ owner uid: ${uid}
condition: event rule hit
rule: * (type: tracepoint, domain: ust)
actions:
notify
+ errors: none
+ errors: none
EOF
list_triggers "one trigger left" "${tmp_expected_stdout}"
-remove_trigger "T0"
+remove_trigger "DEF"
list_triggers "no triggers left" "/dev/null"