X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ftrigger%2Ftest_list_triggers_cli;h=31ba7b366c114d4dd2c1febbf9da555233342302;hb=481c5310f698d32187c0f20bd0d1da3b8b696b06;hp=9c85838b399554492b982ba82318301b1b593cb3;hpb=8a917ae8818ca1c1b9b300b2da65b1abbd9dbc30;p=lttng-tools.git

diff --git a/tests/regression/tools/trigger/test_list_triggers_cli b/tests/regression/tools/trigger/test_list_triggers_cli
index 9c85838b3..31ba7b366 100755
--- a/tests/regression/tools/trigger/test_list_triggers_cli
+++ b/tests/regression/tools/trigger/test_list_triggers_cli
@@ -23,8 +23,7 @@ TESTDIR="$CURDIR/../../.."
 # shellcheck source=../../../utils/utils.sh
 source "$TESTDIR/utils/utils.sh"
 
-
-NUM_TESTS=72
+NUM_TESTS=84
 
 FULL_LTTNG_BIN="${TESTDIR}/../src/bin/lttng/${LTTNG_BIN}"
 
@@ -70,13 +69,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
-	  user id: ${uid}
+	- name: hello
+	  owner uid: ${uid}
 	  condition: event rule hit
-	    rule: test-id (type: tracepoint, domain: ust)
+	    rule: test-name (type: tracepoint, domain: ust)
 	  actions:
 	    notify
 	      errors: none
@@ -92,60 +91,60 @@ 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 --log-level INFO.. --action notify
+	lttng_add_trigger_ok "E" --condition event-rule-matches --domain=user --name=lemming --log-level WARNING --action notify
+	lttng_add_trigger_ok "J" --condition event-rule-matches --domain=user --name=lemming --log-level .. --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
-	  user id: ${uid}
+	- name: A
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: aaa (type: tracepoint, domain: ust, filter: p == 2)
 	  actions:
 	    notify
 	      errors: none
 	  errors: none
-	- id: B
-	  user id: ${uid}
+	- name: B
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: gerboise (type: tracepoint, domain: ust, log level at least INFO)
 	  actions:
 	    notify
 	      errors: none
 	  errors: none
-	- id: C
-	  user id: ${uid}
+	- name: C
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: * (type: tracepoint, domain: ust)
 	  actions:
 	    notify
 	      errors: none
 	  errors: none
-	- id: D
-	  user id: ${uid}
+	- name: D
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: hello* (type: tracepoint, domain: ust, exclusions: hello2,hello3,hello4)
 	  actions:
 	    notify
 	      errors: none
 	  errors: none
-	- id: E
-	  user id: ${uid}
+	- name: E
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: lemming (type: tracepoint, domain: ust, log level is WARNING)
 	  actions:
 	    notify
 	      errors: none
 	  errors: none
-	- id: F
-	  user id: ${uid}
+	- name: F
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: capture-payload-field (type: tracepoint, domain: ust)
 	    captures:
@@ -154,8 +153,8 @@ test_on_event_tracepoint ()
 	    notify
 	      errors: none
 	  errors: none
-	- id: G
-	  user id: ${uid}
+	- name: G
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: capture-array (type: tracepoint, domain: ust)
 	    captures:
@@ -165,8 +164,8 @@ test_on_event_tracepoint ()
 	    notify
 	      errors: none
 	  errors: none
-	- id: H
-	  user id: ${uid}
+	- name: H
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: capture-chan-ctx (type: tracepoint, domain: ust)
 	    captures:
@@ -175,8 +174,8 @@ test_on_event_tracepoint ()
 	    notify
 	      errors: none
 	  errors: none
-	- id: I
-	  user id: ${uid}
+	- name: I
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: capture-app-ctx (type: tracepoint, domain: ust)
 	    captures:
@@ -185,9 +184,17 @@ test_on_event_tracepoint ()
 	    notify
 	      errors: none
 	  errors: none
+	- name: J
+	  owner uid: ${uid}
+	  condition: event rule hit
+	    rule: lemming (type: tracepoint, domain: ust)
+	  actions:
+	    notify
+	      errors: none
+	  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"
@@ -198,6 +205,7 @@ test_on_event_tracepoint ()
 	lttng_remove_trigger_ok "G"
 	lttng_remove_trigger_ok "H"
 	lttng_remove_trigger_ok "I"
+	lttng_remove_trigger_ok "J"
 }
 
 test_on_event_probe ()
@@ -223,29 +231,29 @@ 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
-	  user id: ${uid}
+	- name: T0
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: my_channel_enable (type: probe, location: lttng_channel_enable)
 	  actions:
 	    notify
 	      errors: none
 	  errors: none
-	- id: T1
-	  user id: ${uid}
+	- name: T1
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: my_channel_enable (type: probe, location: ${base_symbol}+${offset_hex})
 	  actions:
 	    notify
 	      errors: none
 	  errors: none
-	- id: T2
-	  user id: ${uid}
+	- name: T2
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: my_channel_enable (type: probe, location: 0x${channel_enable_addr})
 	  actions:
@@ -254,7 +262,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,11 +275,11 @@ 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
-	  user id: ${uid}
+	- name: T0
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: ma-probe-elf (type: userspace probe, location type: ELF, location: ${uprobe_elf_binary}:${elf_function_name})
 	  actions:
@@ -280,14 +288,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,20 +322,20 @@ 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
-	  user id: ${uid}
+	- name: T0
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: open (type: syscall)
 	  actions:
 	    notify
 	      errors: none
 	  errors: none
-	- id: T1
-	  user id: ${uid}
+	- name: T1
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: ptrace (type: syscall, filter: a > 2)
 	  actions:
@@ -337,7 +344,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,93 +354,92 @@ 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
-	  user id: ${uid}
+	- name: T0
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
 	  actions:
 	    snapshot session \`ze-session\`
 	      errors: none
 	  errors: none
-	- id: T1
-	  user id: ${uid}
+	- name: T1
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
 	  actions:
 	    snapshot session \`ze-session\`, path: /some/path
 	      errors: none
 	  errors: none
-	- id: T2
-	  user id: ${uid}
+	- name: T2
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
 	  actions:
 	    snapshot session \`ze-session\`, path: /some/other/path
 	      errors: none
 	  errors: none
-	- id: T3
-	  user id: ${uid}
+	- name: T3
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
 	  actions:
 	    snapshot session \`ze-session\`, url: net://1.2.3.4
 	      errors: none
 	  errors: none
-	- id: T4
-	  user id: ${uid}
+	- name: T4
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
 	  actions:
 	    snapshot session \`ze-session\`, url: net://1.2.3.4:1234:1235
 	      errors: none
 	  errors: none
-	- id: T5
-	  user id: ${uid}
+	- name: T5
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
 	  actions:
 	    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
-	  user id: ${uid}
+	- name: T6
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
 	  actions:
 	    snapshot session \`ze-session\`, path: /some/path, max size: 1234
 	      errors: none
 	  errors: none
-	- id: T7
-	  user id: ${uid}
+	- name: T7
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
 	  actions:
 	    snapshot session \`ze-session\`, path: /some/path, name: meh
 	      errors: none
 	  errors: none
-	- id: T8
-	  user id: ${uid}
+	- name: T8
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
 	  actions:
 	    snapshot session \`ze-session\`, rate policy: after every 10 occurrences
 	      errors: none
 	  errors: none
-	- id: T9
-	  user id: ${uid}
+	- name: T9
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
 	  actions:
@@ -444,28 +450,34 @@ 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
-	  user id: ${uid}
+	- name: T0
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
 	  actions:
 	    notify, rate policy: once after 5 occurrences
 	      errors: none
 	  errors: none
-	- id: T1
-	  user id: ${uid}
+	- name: T1
+	  owner uid: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
 	  actions: