X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ftrigger%2Ftest_remove_trigger_cli;h=9e342d9b571c750e69482d5ed22b407a5031aa36;hb=63dd3d7b5b0979c4b11a6bb8d0e4155120482977;hp=e42d0743cc40bc66dfee6b809f52d70082b6584a;hpb=33e557114a2ba28e26e220a833e8a449c78b8b65;p=lttng-tools.git diff --git a/tests/regression/tools/trigger/test_remove_trigger_cli b/tests/regression/tools/trigger/test_remove_trigger_cli index e42d0743c..9e342d9b5 100755 --- a/tests/regression/tools/trigger/test_remove_trigger_cli +++ b/tests/regression/tools/trigger/test_remove_trigger_cli @@ -27,9 +27,9 @@ plan_tests 17 FULL_LTTNG_BIN="${TESTDIR}/../src/bin/lttng/${LTTNG_BIN}" -tmp_stdout=$(mktemp --tmpdir -t test_list_triggers_cli_stdout.XXXXXX) -tmp_stderr=$(mktemp --tmpdir -t test_list_triggers_cli_stderr.XXXXXX) -tmp_expected_stdout=$(mktemp --tmpdir -t test_list_triggers_cli_expected_stdout.XXXXXX) +tmp_stdout=$(mktemp --tmpdir -t test_remove_triggers_cli_stdout.XXXXXX) +tmp_stderr=$(mktemp --tmpdir -t test_remove_triggers_cli_stderr.XXXXXX) +tmp_expected_stdout=$(mktemp --tmpdir -t test_remove_triggers_cli_expected_stdout.XXXXXX) uid=$(id --user) gid=$(id --group) @@ -68,14 +68,15 @@ function remove_trigger () start_lttng_sessiond_notap # Add a few triggers -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 +lttng_add_trigger_ok "ABC" --condition event-rule-matches --name=aaa --type=user --filter 'p == 2' --action notify +lttng_add_trigger_ok "DEF" --condition event-rule-matches --type=user --action notify cat > "${tmp_expected_stdout}" <<- EOF - name: ABC owner uid: ${uid} condition: event rule matches - rule: aaa (type: tracepoint, domain: ust, filter: p == 2) + rule: aaa (type: user tracepoint, filter: p == 2) + errors: none actions: notify errors: none @@ -83,7 +84,8 @@ cat > "${tmp_expected_stdout}" <<- EOF - name: DEF owner uid: ${uid} condition: event rule matches - rule: * (type: tracepoint, domain: ust) + rule: * (type: user tracepoint) + errors: none actions: notify errors: none @@ -97,7 +99,8 @@ cat > "${tmp_expected_stdout}" <<- EOF - name: DEF owner uid: ${uid} condition: event rule matches - rule: * (type: tracepoint, domain: ust) + rule: * (type: user tracepoint) + errors: none actions: notify errors: none