X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ftrigger%2Ftest_list_triggers_cli;h=30b636969c6e2135a683be02852932868e101667;hp=9c85838b399554492b982ba82318301b1b593cb3;hb=24de704ea32ddb8841624555457b9c46816090b0;hpb=8a917ae8818ca1c1b9b300b2da65b1abbd9dbc30 diff --git a/tests/regression/tools/trigger/test_list_triggers_cli b/tests/regression/tools/trigger/test_list_triggers_cli index 9c85838b3..30b636969 100755 --- a/tests/regression/tools/trigger/test_list_triggers_cli +++ b/tests/regression/tools/trigger/test_list_triggers_cli @@ -24,7 +24,7 @@ TESTDIR="$CURDIR/../../.." source "$TESTDIR/utils/utils.sh" -NUM_TESTS=72 +NUM_TESTS=82 FULL_LTTNG_BIN="${TESTDIR}/../src/bin/lttng/${LTTNG_BIN}" @@ -70,13 +70,13 @@ test_top_level_options () { diag "Listing top level options" - lttng_add_trigger_ok "hello" --condition on-event -u test-id --action notify + lttng_add_trigger_ok "hello" --condition event-rule-matches --domain=user --name=test-name --action notify cat > "${tmp_expected_stdout}" <<- EOF - - id: hello + - name: hello user id: ${uid} condition: event rule hit - rule: test-id (type: tracepoint, domain: ust) + rule: test-name (type: tracepoint, domain: ust) actions: notify errors: none @@ -92,19 +92,18 @@ test_on_event_tracepoint () { diag "Listing on-event tracepoint" - lttng_add_trigger_ok "C" --condition on-event -u -a --action notify - lttng_add_trigger_ok "A" --condition on-event aaa -u --filter 'p == 2' --action notify - lttng_add_trigger_ok "D" --condition on-event 'hello*' -u -x 'hello2,hello3,hello4' --action notify - lttng_add_trigger_ok "B" --condition on-event -u gerboise --loglevel INFO --action notify - lttng_add_trigger_ok "E" --condition on-event -u lemming --loglevel-only WARNING --action notify - lttng_add_trigger_ok "F" --condition on-event -u capture-payload-field --capture a --action notify - lttng_add_trigger_ok "G" --condition on-event -u capture-array --capture 'a[2]' --capture '$ctx.tourlou[18]' --action notify - lttng_add_trigger_ok "H" --condition on-event -u capture-chan-ctx --capture '$ctx.vpid' --action notify - lttng_add_trigger_ok "I" --condition on-event -u capture-app-ctx --capture '$app.iga:active_clients' --action notify - + lttng_add_trigger_ok "C" --condition event-rule-matches --domain=user --action notify + lttng_add_trigger_ok "A" --condition event-rule-matches --name=aaa --domain=user --filter 'p == 2' --action notify + lttng_add_trigger_ok "D" --condition event-rule-matches --name='hello*' --domain=user -x 'hello2,hello3,hello4' --action notify + lttng_add_trigger_ok "B" --condition event-rule-matches --domain=user --name=gerboise --loglevel INFO --action notify + lttng_add_trigger_ok "E" --condition event-rule-matches --domain=user --name=lemming --loglevel-only WARNING --action notify + lttng_add_trigger_ok "F" --condition event-rule-matches --domain=user --name=capture-payload-field --capture a --action notify + lttng_add_trigger_ok "G" --condition event-rule-matches --domain=user --name=capture-array --capture 'a[2]' --capture '$ctx.tourlou[18]' --action notify + lttng_add_trigger_ok "H" --condition event-rule-matches --domain=user --name=capture-chan-ctx --capture '$ctx.vpid' --action notify + lttng_add_trigger_ok "I" --condition event-rule-matches --domain=user --name=capture-app-ctx --capture '$app.iga:active_clients' --action notify cat > "${tmp_expected_stdout}" <<- EOF - - id: A + - name: A user id: ${uid} condition: event rule hit rule: aaa (type: tracepoint, domain: ust, filter: p == 2) @@ -112,7 +111,7 @@ test_on_event_tracepoint () notify errors: none errors: none - - id: B + - name: B user id: ${uid} condition: event rule hit rule: gerboise (type: tracepoint, domain: ust, log level at least INFO) @@ -120,7 +119,7 @@ test_on_event_tracepoint () notify errors: none errors: none - - id: C + - name: C user id: ${uid} condition: event rule hit rule: * (type: tracepoint, domain: ust) @@ -128,7 +127,7 @@ test_on_event_tracepoint () notify errors: none errors: none - - id: D + - name: D user id: ${uid} condition: event rule hit rule: hello* (type: tracepoint, domain: ust, exclusions: hello2,hello3,hello4) @@ -136,7 +135,7 @@ test_on_event_tracepoint () notify errors: none errors: none - - id: E + - name: E user id: ${uid} condition: event rule hit rule: lemming (type: tracepoint, domain: ust, log level is WARNING) @@ -144,7 +143,7 @@ test_on_event_tracepoint () notify errors: none errors: none - - id: F + - name: F user id: ${uid} condition: event rule hit rule: capture-payload-field (type: tracepoint, domain: ust) @@ -154,7 +153,7 @@ test_on_event_tracepoint () notify errors: none errors: none - - id: G + - name: G user id: ${uid} condition: event rule hit rule: capture-array (type: tracepoint, domain: ust) @@ -165,7 +164,7 @@ test_on_event_tracepoint () notify errors: none errors: none - - id: H + - name: H user id: ${uid} condition: event rule hit rule: capture-chan-ctx (type: tracepoint, domain: ust) @@ -175,7 +174,7 @@ test_on_event_tracepoint () notify errors: none errors: none - - id: I + - name: I user id: ${uid} condition: event rule hit rule: capture-app-ctx (type: tracepoint, domain: ust) @@ -187,7 +186,7 @@ test_on_event_tracepoint () errors: none EOF - list_triggers_matches_ok "on-event, tracepoint event rule" "${tmp_expected_stdout}" + list_triggers_matches_ok "event-rule-matches, tracepoint event rule" "${tmp_expected_stdout}" lttng_remove_trigger_ok "A" lttng_remove_trigger_ok "B" @@ -223,12 +222,12 @@ test_on_event_probe () offset_hex="0x$(printf '%x' $offset)" - lttng_add_trigger_ok "T0" --condition on-event -k --probe=lttng_channel_enable my_channel_enable --action notify - lttng_add_trigger_ok "T1" --condition on-event -k --probe="${base_symbol}+${offset_hex}" my_channel_enable --action notify - lttng_add_trigger_ok "T2" --condition on-event -k --probe="0x${channel_enable_addr}" my_channel_enable --action notify + lttng_add_trigger_ok "T0" --condition event-rule-matches --domain=kernel --type=kprobe --location=lttng_channel_enable --event-name=my_channel_enable --action notify + lttng_add_trigger_ok "T1" --condition event-rule-matches --domain=kernel --type=kprobe --location="${base_symbol}+${offset_hex}" --event-name=my_channel_enable --action notify + lttng_add_trigger_ok "T2" --condition event-rule-matches --domain=kernel --type=kprobe --location="0x${channel_enable_addr}" --event-name=my_channel_enable --action notify cat > "${tmp_expected_stdout}" <<- EOF - - id: T0 + - name: T0 user id: ${uid} condition: event rule hit rule: my_channel_enable (type: probe, location: lttng_channel_enable) @@ -236,7 +235,7 @@ test_on_event_probe () notify errors: none errors: none - - id: T1 + - name: T1 user id: ${uid} condition: event rule hit rule: my_channel_enable (type: probe, location: ${base_symbol}+${offset_hex}) @@ -244,7 +243,7 @@ test_on_event_probe () notify errors: none errors: none - - id: T2 + - name: T2 user id: ${uid} condition: event rule hit rule: my_channel_enable (type: probe, location: 0x${channel_enable_addr}) @@ -254,7 +253,7 @@ test_on_event_probe () errors: none EOF - list_triggers_matches_ok "on-event, probe event rule" "${tmp_expected_stdout}" + list_triggers_matches_ok "event-rule-matches, probe event rule" "${tmp_expected_stdout}" lttng_remove_trigger_ok "T0" lttng_remove_trigger_ok "T1" @@ -267,10 +266,10 @@ test_on_event_userspace_probe_elf () diag "Listing on-event userspace-probe elf" - lttng_add_trigger_ok "T0" --condition on-event -k --userspace-probe=${uprobe_elf_binary}:${elf_function_name} ma-probe-elf --action notify + lttng_add_trigger_ok "T0" --condition event-rule-matches --domain=kernel --type=uprobe --location=${uprobe_elf_binary}:test_function --event-name=ma-probe-elf --action notify cat > "${tmp_expected_stdout}" <<- EOF - - id: T0 + - name: T0 user id: ${uid} condition: event rule hit rule: ma-probe-elf (type: userspace probe, location type: ELF, location: ${uprobe_elf_binary}:${elf_function_name}) @@ -280,14 +279,13 @@ test_on_event_userspace_probe_elf () errors: none EOF - list_triggers_matches_ok "on-event, userspace-probe event rule ELF" "${tmp_expected_stdout}" + list_triggers_matches_ok "event-rule-matches, userspace-probe event rule" "${tmp_expected_stdout}" lttng_remove_trigger_ok "T0" } test_on_event_userspace_probe_sdt () { - local sdt_provider_name="foobar" local sdt_probe_name="tp1" @@ -315,11 +313,11 @@ test_on_event_syscall () { diag "Listing on-event syscall" - lttng_add_trigger_ok "T0" --condition on-event -k --syscall open --action notify - lttng_add_trigger_ok "T1" --condition on-event -k --syscall ptrace --filter 'a > 2' --action notify + lttng_add_trigger_ok "T0" --condition event-rule-matches --domain=kernel --type=syscall --name=open --action notify + lttng_add_trigger_ok "T1" --condition event-rule-matches --domain=kernel --type=syscall --name=ptrace --filter 'a > 2' --action notify cat > "${tmp_expected_stdout}" <<- EOF - - id: T0 + - name: T0 user id: ${uid} condition: event rule hit rule: open (type: syscall) @@ -327,7 +325,7 @@ test_on_event_syscall () notify errors: none errors: none - - id: T1 + - name: T1 user id: ${uid} condition: event rule hit rule: ptrace (type: syscall, filter: a > 2) @@ -337,7 +335,7 @@ test_on_event_syscall () errors: none EOF - list_triggers_matches_ok "on-event, syscall event rule" "${tmp_expected_stdout}" + list_triggers_matches_ok "event-rule-matches, syscall event rule" "${tmp_expected_stdout}" lttng_remove_trigger_ok "T0" lttng_remove_trigger_ok "T1" @@ -347,20 +345,19 @@ test_snapshot_action () { diag "Listing snapshot actions" - lttng_add_trigger_ok "T0" --condition on-event -u some-event --action snapshot-session ze-session - lttng_add_trigger_ok "T1" --condition on-event -u some-event --action snapshot-session ze-session --path /some/path - lttng_add_trigger_ok "T2" --condition on-event -u some-event --action snapshot-session ze-session --url file:///some/other/path - lttng_add_trigger_ok "T3" --condition on-event -u some-event --action snapshot-session ze-session --url net://1.2.3.4 - lttng_add_trigger_ok "T4" --condition on-event -u some-event --action snapshot-session ze-session --url net://1.2.3.4:1234:1235 - lttng_add_trigger_ok "T5" --condition on-event -u some-event --action snapshot-session ze-session --ctrl-url=tcp://1.2.3.4:1111 --data-url=tcp://1.2.3.4:1112 - lttng_add_trigger_ok "T6" --condition on-event -u some-event --action snapshot-session ze-session --path /some/path --max-size=1234 - lttng_add_trigger_ok "T7" --condition on-event -u some-event --action snapshot-session ze-session --path /some/path --name=meh - lttng_add_trigger_ok "T8" --condition on-event -u some-event --action snapshot-session ze-session --rate-policy=every:10 - lttng_add_trigger_ok "T9" --condition on-event -u some-event --action snapshot-session ze-session --rate-policy=once-after:10 - + lttng_add_trigger_ok "T0" --condition event-rule-matches --domain=user --name=some-event --action snapshot-session ze-session + lttng_add_trigger_ok "T1" --condition event-rule-matches --domain=user --name=some-event --action snapshot-session ze-session --path /some/path + lttng_add_trigger_ok "T2" --condition event-rule-matches --domain=user --name=some-event --action snapshot-session ze-session --url file:///some/other/path + lttng_add_trigger_ok "T3" --condition event-rule-matches --domain=user --name=some-event --action snapshot-session ze-session --url net://1.2.3.4 + lttng_add_trigger_ok "T4" --condition event-rule-matches --domain=user --name=some-event --action snapshot-session ze-session --url net://1.2.3.4:1234:1235 + lttng_add_trigger_ok "T5" --condition event-rule-matches --domain=user --name=some-event --action snapshot-session ze-session --ctrl-url=tcp://1.2.3.4:1111 --data-url=tcp://1.2.3.4:1112 + lttng_add_trigger_ok "T6" --condition event-rule-matches --domain=user --name=some-event --action snapshot-session ze-session --path /some/path --max-size=1234 + lttng_add_trigger_ok "T7" --condition event-rule-matches --domain=user --name=some-event --action snapshot-session ze-session --path /some/path --name=meh + lttng_add_trigger_ok "T8" --condition event-rule-matches --domain=user --name=some-event --action snapshot-session ze-session --rate-policy=every:10 + lttng_add_trigger_ok "T9" --condition event-rule-matches --domain=user --name=some-event --action snapshot-session ze-session --rate-policy=once-after:10 cat > "${tmp_expected_stdout}" <<- EOF - - id: T0 + - name: T0 user id: ${uid} condition: event rule hit rule: some-event (type: tracepoint, domain: ust) @@ -368,7 +365,7 @@ test_snapshot_action () snapshot session \`ze-session\` errors: none errors: none - - id: T1 + - name: T1 user id: ${uid} condition: event rule hit rule: some-event (type: tracepoint, domain: ust) @@ -376,7 +373,7 @@ test_snapshot_action () snapshot session \`ze-session\`, path: /some/path errors: none errors: none - - id: T2 + - name: T2 user id: ${uid} condition: event rule hit rule: some-event (type: tracepoint, domain: ust) @@ -384,7 +381,7 @@ test_snapshot_action () snapshot session \`ze-session\`, path: /some/other/path errors: none errors: none - - id: T3 + - name: T3 user id: ${uid} condition: event rule hit rule: some-event (type: tracepoint, domain: ust) @@ -392,7 +389,7 @@ test_snapshot_action () snapshot session \`ze-session\`, url: net://1.2.3.4 errors: none errors: none - - id: T4 + - name: T4 user id: ${uid} condition: event rule hit rule: some-event (type: tracepoint, domain: ust) @@ -400,7 +397,7 @@ test_snapshot_action () snapshot session \`ze-session\`, url: net://1.2.3.4:1234:1235 errors: none errors: none - - id: T5 + - name: T5 user id: ${uid} condition: event rule hit rule: some-event (type: tracepoint, domain: ust) @@ -408,7 +405,7 @@ test_snapshot_action () snapshot session \`ze-session\`, control url: tcp://1.2.3.4:1111, data url: tcp://1.2.3.4:1112 errors: none errors: none - - id: T6 + - name: T6 user id: ${uid} condition: event rule hit rule: some-event (type: tracepoint, domain: ust) @@ -416,7 +413,7 @@ test_snapshot_action () snapshot session \`ze-session\`, path: /some/path, max size: 1234 errors: none errors: none - - id: T7 + - name: T7 user id: ${uid} condition: event rule hit rule: some-event (type: tracepoint, domain: ust) @@ -424,7 +421,7 @@ test_snapshot_action () snapshot session \`ze-session\`, path: /some/path, name: meh errors: none errors: none - - id: T8 + - name: T8 user id: ${uid} condition: event rule hit rule: some-event (type: tracepoint, domain: ust) @@ -432,7 +429,7 @@ test_snapshot_action () snapshot session \`ze-session\`, rate policy: after every 10 occurrences errors: none errors: none - - id: T9 + - name: T9 user id: ${uid} condition: event rule hit rule: some-event (type: tracepoint, domain: ust) @@ -444,19 +441,25 @@ test_snapshot_action () list_triggers_matches_ok "snapshot action" "${tmp_expected_stdout}" - stop_lttng_sessiond_notap + lttng_remove_trigger_ok "T0" + lttng_remove_trigger_ok "T1" + lttng_remove_trigger_ok "T2" + lttng_remove_trigger_ok "T3" + lttng_remove_trigger_ok "T4" + lttng_remove_trigger_ok "T5" + lttng_remove_trigger_ok "T6" + lttng_remove_trigger_ok "T7" + lttng_remove_trigger_ok "T8" + lttng_remove_trigger_ok "T9" } test_notify_action () { - start_lttng_sessiond_notap - - lttng_add_trigger_ok "T0" --condition on-event -u some-event --action notify --rate-policy=once-after:5 - lttng_add_trigger_ok "T1" --condition on-event -u some-event --action notify --rate-policy=every:10 - + lttng_add_trigger_ok "T0" --condition event-rule-matches --domain=user --name=some-event --action notify --rate-policy=once-after:5 + lttng_add_trigger_ok "T1" --condition event-rule-matches --domain=user --name=some-event --action notify --rate-policy=every:10 cat > "${tmp_expected_stdout}" <<- EOF - - id: T0 + - name: T0 user id: ${uid} condition: event rule hit rule: some-event (type: tracepoint, domain: ust) @@ -464,7 +467,7 @@ test_notify_action () notify, rate policy: once after 5 occurrences errors: none errors: none - - id: T1 + - name: T1 user id: ${uid} condition: event rule hit rule: some-event (type: tracepoint, domain: ust)