X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ftrigger%2Ftest_add_trigger_cli;h=ba46a64ab59da96e2c7d67e11299f41df6c35242;hp=a8d03c4dd66d9f3aabacc1f78f7bba9e3861b4e2;hb=665db06360d2bb830a47a2562ef0ebc28a1d75df;hpb=1d4b59f247e2692bf1e9c3c0aac93a47389d20dd diff --git a/tests/regression/tools/trigger/test_add_trigger_cli b/tests/regression/tools/trigger/test_add_trigger_cli index a8d03c4dd..ba46a64ab 100755 --- a/tests/regression/tools/trigger/test_add_trigger_cli +++ b/tests/regression/tools/trigger/test_add_trigger_cli @@ -79,56 +79,56 @@ function test_failure () # top-level options test_success "explicit name" \ --name hohoho \ - --condition on-event some-event-id -u \ + --condition event-rule-matches some-event-id -u \ --action notify -# `--condition on-event` successes -test_success "--condition on-event some-event -u" \ - --condition on-event some-event -u \ +# `--condition event-rule-matches` successes +test_success "--condition event-rule-matches some-event -u" \ + --condition event-rule-matches some-event -u \ --action notify -test_success "--condition on-event -a -u" \ - --condition on-event -a -u \ +test_success "--condition event-rule-matches -a -u" \ + --condition event-rule-matches -a -u \ --action notify test_success "notify action polices" \ - --condition on-event -u test-rate-policy=once-after \ + --condition event-rule-matches -u test-rate-policy \ --action notify \ --rate-policy=every:55 \ --action notify \ --rate-policy=once-after:55 test_success "start session action polices" \ - --condition on-event -u test-rate-policy=once-after \ + --condition event-rule-matches -u test-rate-policy \ --action start-session my_session \ --rate-policy=every:55 \ --action start-session my_session \ --rate-policy=once-after:55 test_success "stop session action polices" \ - --condition on-event -u test-rate-policy=once-after \ + --condition event-rule-matches -u test-rate-policy \ --action stop-session my_session \ --rate-policy=every:55 \ --action stop-session my_session \ --rate-policy=once-after:55 test_success "snapshot session action polices" \ - --condition on-event -u test-rate-policy=once-after \ + --condition event-rule-matches -u test-rate-policy \ --action snapshot-session my_session \ --rate-policy=every:55 \ --action snapshot-session my_session \ --rate-policy=once-after:55 test_success "rotate session action polices" \ - --condition on-event -u test-rate-policy=once-after \ + --condition event-rule-matches -u test-rate-policy \ --action rotate-session my_session \ --rate-policy=every:55 \ --action rotate-session my_session \ --rate-policy=once-after:55 skip $ist_root "non-root user: skipping kprobe tests" 9 || { - test_success "--condition on-event probe by symbol" \ - --condition on-event -k --probe=lttng_channel_enable my_channel_enable \ + test_success "--condition event-rule-matches probe by symbol" \ + --condition event-rule-matches -k --probe=lttng_channel_enable my_channel_enable \ --action notify channel_enable_addr=$(grep ' t lttng_channel_enable\s\[lttng_tracer\]$' /proc/kallsyms | cut -f 1 -d ' ') @@ -147,102 +147,102 @@ skip $ist_root "non-root user: skipping kprobe tests" 9 || { offset_hex="0x$(printf '%x' $offset)" - test_success "--condition on-event probe by symbol with offset" \ - --condition on-event -k --probe="${base_symbol}+${offset_hex}" my_$base_symbol \ + test_success "--condition event-rule-matches probe by symbol with offset" \ + --condition event-rule-matches -k --probe="${base_symbol}+${offset_hex}" my_$base_symbol \ --action notify - test_success "--condition on-event probe by address" \ - --condition on-event -k "--probe=0x${channel_enable_addr}" my_channel_enable \ + test_success "--condition event-rule-matches probe by address" \ + --condition event-rule-matches -k "--probe=0x${channel_enable_addr}" my_channel_enable \ --action notify } skip $ist_root "non-root user: skipping uprobe tests" 6 || { - test_success "--condition on-event uprobe" \ - --condition on-event -k --userspace-probe=${uprobe_elf_binary}:test_function ma-probe \ + test_success "--condition event-rule-matches uprobe" \ + --condition event-rule-matches -k --userspace-probe=${uprobe_elf_binary}:test_function ma-probe \ --action notify - test_success "--condition on-event uprobe with elf prefix" \ - --condition on-event -k --userspace-probe=elf:${uprobe_elf_binary}:test_function ma-probe-2 \ + test_success "--condition event-rule-matches uprobe with elf prefix" \ + --condition event-rule-matches -k --userspace-probe=elf:${uprobe_elf_binary}:test_function ma-probe-2 \ --action notify } skip $ist_root "non-root user: skipping syscall tests" 9 || { - test_success "--condition on-event syscall" \ - --condition on-event -k --syscall open \ + test_success "--condition event-rule-matches syscall" \ + --condition event-rule-matches -k --syscall open \ --action notify - test_success "--condition on-event syscall -a" \ - --condition on-event -k --syscall -a \ + test_success "--condition event-rule-matches syscall -a" \ + --condition event-rule-matches -k --syscall -a \ --action notify - test_success "--condition on-event syscall with filter" \ - --condition on-event -k --syscall --filter 'a > 2' open \ + test_success "--condition event-rule-matches syscall with filter" \ + --condition event-rule-matches -k --syscall --filter 'a > 2' open \ --action notify } # `--action notify` successes test_success "--action notify" \ - --condition on-event some-event-notify -u \ + --condition event-rule-matches some-event-notify -u \ --action notify test_success "--action notify --capture foo" \ - --condition on-event some-event-notify-foo -u \ + --condition event-rule-matches some-event-notify-foo -u \ --capture foo --action notify test_success "--action notify --capture foo[2]" \ - --condition on-event some-event-notify-foo2 -u \ + --condition event-rule-matches some-event-notify-foo2 -u \ --capture 'foo[2]' --action notify test_success '--action notify --capture $ctx.foo' \ - --condition on-event some-event-notify-ctx-foo -u \ + --condition event-rule-matches some-event-notify-ctx-foo -u \ --capture '$ctx.foo' --action notify test_success '--action notify --capture $ctx.foo[2]' \ - --condition on-event some-event-notify-ctx-foo2 -u \ + --condition event-rule-matches some-event-notify-ctx-foo2 -u \ --capture '$ctx.foo[2]' --action notify test_success '--action notify --capture $app.prov:type' \ - --condition on-event some-event-notify-app-prov-type -u \ + --condition event-rule-matches some-event-notify-app-prov-type -u \ --capture '$app.prov:type' --action notify test_success '--action notify --capture $app.prov:type[2]' \ - --condition on-event some-event-notify-app-prov-type-2 -u \ + --condition event-rule-matches some-event-notify-app-prov-type-2 -u \ --capture '$app.prov:type[2]' --action notify test_success '--action notify multiple captures' \ - --condition on-event some-event-notify-multiple-captures -u \ + --condition event-rule-matches some-event-notify-multiple-captures -u \ --capture foo --capture '$app.hello:world' --action notify # `--action start-session` successes test_success "--action start-session" \ - --condition on-event some-event-start-session -u \ + --condition event-rule-matches some-event-start-session -u \ --action start-session ze-session # `--action stop-session` successes test_success "--action stop-session foo" \ - --condition on-event some-event-stop-session -u \ + --condition event-rule-matches some-event-stop-session -u \ --action stop-session ze-session # `--action rotate-session` successes test_success "--action rotate-session foo" \ - --condition on-event some-event-rotate-session -u \ + --condition event-rule-matches some-event-rotate-session -u \ --action rotate-session ze-session # `--action snapshot-session` successes test_success "--action snapshot-session foo" \ - --condition on-event some-event-snapshot-session -u \ + --condition event-rule-matches some-event-snapshot-session -u \ --action snapshot-session ze-session test_success "--action snapshot-session with file URI" \ - --condition on-event some-event-snapshot-session2 -u \ + --condition event-rule-matches some-event-snapshot-session2 -u \ --action snapshot-session ze-session --path /hello test_success "--action snapshot-session with net URI" \ - --condition on-event some-event-snapshot-session3 -u \ + --condition event-rule-matches some-event-snapshot-session3 -u \ --action snapshot-session ze-session --url net://1.2.3.4 test_success "--action snapshot-session with ctrl/data URIs" \ - --condition on-event some-event-snapshot-session4 -u \ + --condition event-rule-matches some-event-snapshot-session4 -u \ --action snapshot-session ze-session --ctrl-url=tcp://1.2.3.4:1234 --data-url=tcp://1.2.3.4:1235 # top-level failures @@ -254,12 +254,12 @@ test_failure "unknown option" \ test_failure "missing --action" \ "Error: Need at least one --action." \ - --condition on-event hello -u + --condition event-rule-matches hello -u test_failure "two --condition" \ "Error: A --condition was already given." \ - --condition on-event aaa -u \ - --condition on-event bbb -u \ + --condition event-rule-matches aaa -u \ + --condition event-rule-matches bbb -u \ --action notify test_failure "missing argument to --name" \ @@ -269,23 +269,23 @@ test_failure "missing argument to --name" \ for cmd in rate-policy=once-after rate-policy=every; do test_failure "missing argument to --${cmd}" \ "Error: Rate policy format is invalid." \ - --condition on-event -u -a --action notify \ + --condition event-rule-matches -u -a --action notify \ --${cmd} test_failure "invalid argument to --${cmd}: non-digit character" \ "Error: Failed to parse rate policy value \`123bob\` as an integer." \ - --condition on-event -u -a --action notify \ + --condition event-rule-matches -u -a --action notify \ --${cmd}:123bob test_failure "invalid argument to --${cmd}: empty string" \ "Error: Failed to parse rate policy value \`\` as an integer." \ - --condition on-event -u -a --action notify \ + --condition event-rule-matches -u -a --action notify \ --${cmd}":" done test_failure "invalid argument to --rate-policy: unknown policy type" \ "Error: Rate policy type \`bob\` unknown." \ - --condition on-event -u -a --action notify \ + --condition event-rule-matches -u -a --action notify \ --rate-policy=bob:123 # `--condition` failures @@ -296,154 +296,154 @@ test_failure "unknown --condition" \ "Error: Unknown condition name 'zoofest'" \ --condition zoofest -# `--condition on-event` failures -test_failure "missing args after --condition on-event" \ +# `--condition event-rule-matches` failures +test_failure "missing args after --condition event-rule-matches" \ "Error: Need to provide either a tracepoint name or -a/--all." \ - --condition on-event -test_failure "missing domain in --condition on-event" \ + --condition event-rule-matches +test_failure "missing domain in --condition event-rule-matches" \ "Error: Please specify a domain (--kernel/--userspace/--jul/--log4j/--python)." \ - --condition on-event -a -test_failure "extra args after --condition on-event" \ + --condition event-rule-matches -a +test_failure "extra args after --condition event-rule-matches" \ "Error: Unexpected argument 'bozo'" \ - --condition on-event foo -u bozo -test_failure "--condition on-event: --all with --probe" \ + --condition event-rule-matches foo -u bozo +test_failure "--condition event-rule-matches: --all with --probe" \ "Error: Can't use -a/--all with probe event rules." \ - --condition on-event --probe=do_sys_open --all -test_failure "--condition on-event: missing tracepoint name with --probe" \ + --condition event-rule-matches --probe=do_sys_open --all +test_failure "--condition event-rule-matches: missing tracepoint name with --probe" \ "Error: Need to provide either a tracepoint name or -a/--all." \ - --condition on-event -k --probe do_sys_open + --condition event-rule-matches -k --probe do_sys_open -test_failure "--condition on-event: missing tracepoint name with --userspace-probe" \ +test_failure "--condition event-rule-matches: missing tracepoint name with --userspace-probe" \ "Error: Need to provide either a tracepoint name or -a/--all." \ - --condition on-event -k --userspace-probe=${uprobe_elf_binary}:test_function + --condition event-rule-matches -k --userspace-probe=${uprobe_elf_binary}:test_function -test_failure "--condition on-event: extra argument with --userspace-probe" \ +test_failure "--condition event-rule-matches: extra argument with --userspace-probe" \ "Error: Unexpected argument 'world'" \ - --condition on-event -k --userspace-probe=${uprobe_elf_binary}:test_failure hello world + --condition event-rule-matches -k --userspace-probe=${uprobe_elf_binary}:test_failure hello world -test_failure "--condition on-event: missing tracepoint name with --syscall" \ +test_failure "--condition event-rule-matches: missing tracepoint name with --syscall" \ "Error: Need to provide either a tracepoint name or -a/--all." \ - --condition on-event -k --syscall + --condition event-rule-matches -k --syscall -test_failure "--condition on-event: extra argument with --syscall" \ +test_failure "--condition event-rule-matches: extra argument with --syscall" \ "Error: Unexpected argument 'open'" \ - --condition on-event -k --syscall open open + --condition event-rule-matches -k --syscall open open -test_failure "--condition on-event: both -a and a tracepoint name with --syscall" \ +test_failure "--condition event-rule-matches: both -a and a tracepoint name with --syscall" \ "Error: Can't provide a tracepoint name with -a/--all." \ - --condition on-event -k --syscall -a open + --condition event-rule-matches -k --syscall -a open -test_failure "--condition on-event --capture: missing argument (end of arg list)" \ +test_failure "--condition event-rule-matches --capture: missing argument (end of arg list)" \ 'Error: While parsing argument #3 (`--capture`): Missing required argument for option `--capture`' \ --action notify \ - --condition on-event -u -a --capture + --condition event-rule-matches -u -a --capture -test_failure "--condition on-event --capture: missing argument (before another option)" \ +test_failure "--condition event-rule-matches --capture: missing argument (before another option)" \ 'Error: While parsing expression `--action`: Unary operators are not allowed in capture expressions.' \ - --condition on-event -u -a --capture \ + --condition event-rule-matches -u -a --capture \ --action notify \ -test_failure "--condition on-event --capture: binary operator" \ +test_failure "--condition event-rule-matches --capture: binary operator" \ 'Error: While parsing expression `foo == 2`: Binary operators are not allowed in capture expressions.' \ - --condition on-event -u -a \ + --condition event-rule-matches -u -a \ --capture 'foo == 2' --action notify -test_failure "--condition on-event --capture: unary operator" \ +test_failure "--condition event-rule-matches --capture: unary operator" \ 'Error: While parsing expression `!foo`: Unary operators are not allowed in capture expressions.' \ - --condition on-event -u -a \ + --condition event-rule-matches -u -a \ --capture '!foo' --action notify -test_failure "--condition on-event --capture: logical operator" \ +test_failure "--condition event-rule-matches --capture: logical operator" \ 'Error: While parsing expression `foo || bar`: Logical operators are not allowed in capture expressions.' \ - --condition on-event -u -a \ + --condition event-rule-matches -u -a \ --capture 'foo || bar' --action notify -test_failure "--condition on-event --capture: accessing a sub-field" \ +test_failure "--condition event-rule-matches --capture: accessing a sub-field" \ 'Error: While parsing expression `foo.bar`: Capturing subfields is not supported.' \ - --condition on-event -u -a \ + --condition event-rule-matches -u -a \ --capture 'foo.bar' --action notify -test_failure "--condition on-event --capture: accessing the sub-field of an array element" \ +test_failure "--condition event-rule-matches --capture: accessing the sub-field of an array element" \ 'Error: While parsing expression `foo[3].bar`: Capturing subfields is not supported.' \ - --condition on-event -u -a \ + --condition event-rule-matches -u -a \ --capture 'foo[3].bar' --action notify -test_failure "--condition on-event --capture: missing colon in app-specific context field" \ +test_failure "--condition event-rule-matches --capture: missing colon in app-specific context field" \ 'Error: Invalid app-specific context field name: missing colon in `foo`.' \ - --condition on-event -u -a \ + --condition event-rule-matches -u -a \ --capture '$app.foo' --action notify -test_failure "--condition on-event --capture: missing colon in app-specific context field" \ +test_failure "--condition event-rule-matches --capture: missing colon in app-specific context field" \ 'Error: Invalid app-specific context field name: missing type name after colon in `foo:`.' \ - --condition on-event -u -a \ + --condition event-rule-matches -u -a \ --capture '$app.foo:' --action notify # `--action` failures test_failure "missing args after --action" \ "Error: While parsing argument #1 (\`--action\`): Missing required argument for option \`--action\`" \ - --condition on-event -u -a \ + --condition event-rule-matches -u -a \ --action # `--action notify` failures test_failure "extra arg after --action notify" \ "Error: Unexpected argument \`bob\`." \ - --condition on-event -u -a \ + --condition event-rule-matches -u -a \ --action notify bob # `--action start-session` failures test_failure "missing arg after --action start-session" \ "Error: Missing session name." \ - --condition on-event some-event-start-session -u \ + --condition event-rule-matches some-event-start-session -u \ --action start-session test_failure "extra arg after --action start-session" \ "Error: Unexpected argument \`bob\`." \ - --condition on-event some-event-start-session -u \ + --condition event-rule-matches some-event-start-session -u \ --action start-session ze-session bob # `--action stop-session` failures test_failure "missing arg after --action stop-session" \ "Error: Missing session name." \ - --condition on-event some-event-stop-session -u \ + --condition event-rule-matches some-event-stop-session -u \ --action stop-session test_failure "extra arg after --action stop-session" \ "Error: Unexpected argument \`bob\`." \ - --condition on-event some-event-stop-session -u \ + --condition event-rule-matches some-event-stop-session -u \ --action stop-session ze-session bob # `--action rotate-session` failures test_failure "missing arg after --action rotate-session" \ "Error: Missing session name." \ - --condition on-event some-event-rotate-session -u \ + --condition event-rule-matches some-event-rotate-session -u \ --action rotate-session test_failure "extra arg after --action rotate-session" \ "Error: Unexpected argument \`bob\`." \ - --condition on-event some-event-rotate-session -u \ + --condition event-rule-matches some-event-rotate-session -u \ --action rotate-session ze-session bob # `--action snapshot-session` failures test_failure "missing arg after --action snapshot-session" \ "Error: Missing session name." \ - --condition on-event some-event-snapshot-session -u \ + --condition event-rule-matches some-event-snapshot-session -u \ --action snapshot-session test_failure "extra arg after --action snapshot-session" \ "Error: Unexpected argument \`bob\`." \ - --condition on-event some-event-snapshot-session -u \ + --condition event-rule-matches some-event-snapshot-session -u \ --action snapshot-session ze-session bob test_failure "snapshot-session action, --max-size without destination" \ "Error: Can't provide a snapshot output max size without a snapshot output destination." \ - --condition on-event some-event-snapshot-session -u \ + --condition event-rule-matches some-event-snapshot-session -u \ --action snapshot-session ze-session --max-size 10M test_failure "snapshot-session action, --name without destination" \ "Error: Can't provide a snapshot output name without a snapshot output destination." \ - --condition on-event some-event-snapshot-session -u \ + --condition event-rule-matches some-event-snapshot-session -u \ --action snapshot-session ze-session --name hallo test_failure "snapshot-session action, --name with-local-path-instead-of-url" \ "Error: Failed to parse '/something/that/looks/like/a/path' as an URL." \ - --condition on-event some-event-snapshot-session -u \ + --condition event-rule-matches some-event-snapshot-session -u \ --action snapshot-session ze-session --name hallo --url /something/that/looks/like/a/path test_failure "snapshot-session action, --name with-net-url-instead-of-path" \ "Error: Failed to parse 'net://8.8.8.8/' as a local path." \ - --condition on-event some-event-snapshot-session -u \ + --condition event-rule-matches some-event-snapshot-session -u \ --action snapshot-session ze-session --name hallo --path net://8.8.8.8/ # Cleanup