X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ftrigger%2Ftest_list_triggers_cli;h=60221a2b57fbab0d3bb6f09f3c625df27502923c;hp=169613375132bb6f3b60fa59b0db923bc6bbe69f;hb=be7f9dfc77b9541a1ecbbc4c44c80d4aefc66b31;hpb=bbadb5e0b423348492c56ef7d8430087d9d9349d

diff --git a/tests/regression/tools/trigger/test_list_triggers_cli b/tests/regression/tools/trigger/test_list_triggers_cli
index 169613375..60221a2b5 100755
--- a/tests/regression/tools/trigger/test_list_triggers_cli
+++ b/tests/regression/tools/trigger/test_list_triggers_cli
@@ -23,7 +23,8 @@ TESTDIR="$CURDIR/../../.."
 # shellcheck source=../../../utils/utils.sh
 source "$TESTDIR/utils/utils.sh"
 
-plan_tests 49
+
+NUM_TESTS=67
 
 FULL_LTTNG_BIN="${TESTDIR}/../src/bin/lttng/${LTTNG_BIN}"
 
@@ -41,7 +42,8 @@ else
 	ist_root=0
 fi
 
-function list_triggers ()
+
+function list_triggers_matches_ok ()
 {
 	local test_name="$1"
 	local expected_stdout_file="$2"
@@ -58,9 +60,7 @@ function list_triggers ()
 
 test_top_level_options ()
 {
-	# shellcheck disable=SC2119
-	start_lttng_sessiond_notap
-
+	diag "Listing top level options"
 
 	lttng_add_trigger_ok "hello" --condition on-event -u test-id --action notify
 
@@ -69,20 +69,20 @@ test_top_level_options ()
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: test-id (type: tracepoint, domain: ust)
-	    tracer notifications discarded: 0
 	  actions:
 	    notify
+	      errors: none
+	  errors: none
 	EOF
 
-	list_triggers "top level options" "${tmp_expected_stdout}"
+	list_triggers_matches_ok "top level options" "${tmp_expected_stdout}"
 
-	stop_lttng_sessiond_notap
+	lttng_remove_trigger_ok "hello"
 }
 
 test_on_event_tracepoint ()
 {
-	# shellcheck disable=SC2119
-	start_lttng_sessiond_notap
+	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
@@ -100,79 +100,96 @@ test_on_event_tracepoint ()
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: aaa (type: tracepoint, domain: ust, filter: p == 2)
-	    tracer notifications discarded: 0
 	  actions:
 	    notify
+	      errors: none
+	  errors: none
 	- id: B
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: gerboise (type: tracepoint, domain: ust, log level at least INFO)
-	    tracer notifications discarded: 0
 	  actions:
 	    notify
+	      errors: none
+	  errors: none
 	- id: C
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: * (type: tracepoint, domain: ust)
-	    tracer notifications discarded: 0
 	  actions:
 	    notify
+	      errors: none
+	  errors: none
 	- id: D
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: hello* (type: tracepoint, domain: ust, exclusions: hello2,hello3,hello4)
-	    tracer notifications discarded: 0
 	  actions:
 	    notify
+	      errors: none
+	  errors: none
 	- id: E
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: lemming (type: tracepoint, domain: ust, log level is WARNING)
-	    tracer notifications discarded: 0
 	  actions:
 	    notify
+	      errors: none
+	  errors: none
 	- id: F
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: capture-payload-field (type: tracepoint, domain: ust)
-	    tracer notifications discarded: 0
 	    captures:
 	      - a
 	  actions:
 	    notify
+	      errors: none
+	  errors: none
 	- id: G
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: capture-array (type: tracepoint, domain: ust)
-	    tracer notifications discarded: 0
 	    captures:
 	      - a[2]
 	      - \$ctx.tourlou[18]
 	  actions:
 	    notify
+	      errors: none
+	  errors: none
 	- id: H
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: capture-chan-ctx (type: tracepoint, domain: ust)
-	    tracer notifications discarded: 0
 	    captures:
 	      - \$ctx.vpid
 	  actions:
 	    notify
+	      errors: none
+	  errors: none
 	- id: I
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: capture-app-ctx (type: tracepoint, domain: ust)
-	    tracer notifications discarded: 0
 	    captures:
 	      - \$app.iga:active_clients
 	  actions:
 	    notify
+	      errors: none
+	  errors: none
 	EOF
 
-	list_triggers "on-event, tracepoint event rule" "${tmp_expected_stdout}"
-
-	stop_lttng_sessiond_notap
+	list_triggers_matches_ok "on-event, tracepoint event rule" "${tmp_expected_stdout}"
+
+	lttng_remove_trigger_ok "A"
+	lttng_remove_trigger_ok "B"
+	lttng_remove_trigger_ok "C"
+	lttng_remove_trigger_ok "D"
+	lttng_remove_trigger_ok "E"
+	lttng_remove_trigger_ok "F"
+	lttng_remove_trigger_ok "G"
+	lttng_remove_trigger_ok "H"
+	lttng_remove_trigger_ok "I"
 }
 
 test_on_event_probe ()
@@ -180,8 +197,7 @@ test_on_event_probe ()
 	local channel_enable_addr
 	local channel_disable_addr
 
-	# shellcheck disable=SC2119
-	start_lttng_sessiond_notap
+	diag "Listing on-event kernel probe"
 
 	channel_enable_addr=$(grep ' t lttng_channel_enable\s\[lttng_tracer\]$' /proc/kallsyms | cut -f 1 -d ' ')
 	channel_disable_addr=$(grep ' t lttng_channel_disable\s\[lttng_tracer\]$' /proc/kallsyms | cut -f 1 -d ' ')
@@ -208,56 +224,62 @@ test_on_event_probe ()
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: my_channel_enable (type: probe, location: lttng_channel_enable)
-	    tracer notifications discarded: 0
 	  actions:
 	    notify
+	      errors: none
+	  errors: none
 	- id: T1
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: my_channel_enable (type: probe, location: ${base_symbol}+${offset_hex})
-	    tracer notifications discarded: 0
 	  actions:
 	    notify
+	      errors: none
+	  errors: none
 	- id: T2
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: my_channel_enable (type: probe, location: 0x${channel_enable_addr})
-	    tracer notifications discarded: 0
 	  actions:
 	    notify
+	      errors: none
+	  errors: none
 	EOF
 
-	list_triggers "on-event, probe event rule" "${tmp_expected_stdout}"
+	list_triggers_matches_ok "on-event, probe event rule" "${tmp_expected_stdout}"
 
-	stop_lttng_sessiond_notap
+	lttng_remove_trigger_ok "T0"
+	lttng_remove_trigger_ok "T1"
+	lttng_remove_trigger_ok "T2"
 }
 
 test_on_event_userspace_probe ()
 {
-	# shellcheck disable=SC2119
-	start_lttng_sessiond_notap
+	local elf_function_name="test_function"
+
+	diag "Listing on-event userspace-probe elf"
 
-	lttng_add_trigger_ok "T0" --condition on-event -k --userspace-probe=${uprobe_elf_binary}:test_function ma-probe --action notify
+	lttng_add_trigger_ok "T0" --condition on-event -k --userspace-probe=${uprobe_elf_binary}:${elf_function_name} ma-probe-elf --action notify
 
 	cat > "${tmp_expected_stdout}" <<- EOF
 	- id: T0
 	  user id: ${uid}
 	  condition: event rule hit
-	    rule: ma-probe (type: userspace probe, location: ${uprobe_elf_binary}:test_function)
-	    tracer notifications discarded: 0
+	    rule: ma-probe-elf (type: userspace probe, location: ${uprobe_elf_binary}:${elf_function_name})
 	  actions:
 	    notify
+	      errors: none
+	  errors: none
 	EOF
 
-	list_triggers "on-event, userspace-probe event rule" "${tmp_expected_stdout}"
+	list_triggers_matches_ok "on-event, userspace-probe event rule ELF" "${tmp_expected_stdout}"
 
-	stop_lttng_sessiond_notap
+	lttng_remove_trigger_ok "T0"
 }
 
 test_on_event_syscall ()
 {
-	# shellcheck disable=SC2119
-	start_lttng_sessiond_notap
+	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
@@ -267,26 +289,29 @@ test_on_event_syscall ()
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: open (type: syscall)
-	    tracer notifications discarded: 0
 	  actions:
 	    notify
+	      errors: none
+	  errors: none
 	- id: T1
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: ptrace (type: syscall, filter: a > 2)
-	    tracer notifications discarded: 0
 	  actions:
 	    notify
+	      errors: none
+	  errors: none
 	EOF
 
-	list_triggers "on-event, syscall event rule" "${tmp_expected_stdout}"
+	list_triggers_matches_ok "on-event, syscall event rule" "${tmp_expected_stdout}"
 
-	stop_lttng_sessiond_notap
+	lttng_remove_trigger_ok "T0"
+	lttng_remove_trigger_ok "T1"
 }
 
 test_snapshot_action ()
 {
-	start_lttng_sessiond_notap
+	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
@@ -305,75 +330,85 @@ test_snapshot_action ()
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
-	    tracer notifications discarded: 0
 	  actions:
 	    snapshot session \`ze-session\`
+	      errors: none
+	  errors: none
 	- id: T1
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
-	    tracer notifications discarded: 0
 	  actions:
 	    snapshot session \`ze-session\`, path: /some/path
+	      errors: none
+	  errors: none
 	- id: T2
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
-	    tracer notifications discarded: 0
 	  actions:
 	    snapshot session \`ze-session\`, path: /some/other/path
+	      errors: none
+	  errors: none
 	- id: T3
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
-	    tracer notifications discarded: 0
 	  actions:
 	    snapshot session \`ze-session\`, url: net://1.2.3.4
+	      errors: none
+	  errors: none
 	- id: T4
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
-	    tracer notifications discarded: 0
 	  actions:
 	    snapshot session \`ze-session\`, url: net://1.2.3.4:1234:1235
+	      errors: none
+	  errors: none
 	- id: T5
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
-	    tracer notifications discarded: 0
 	  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}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
-	    tracer notifications discarded: 0
 	  actions:
 	    snapshot session \`ze-session\`, path: /some/path, max size: 1234
+	      errors: none
+	  errors: none
 	- id: T7
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
-	    tracer notifications discarded: 0
 	  actions:
 	    snapshot session \`ze-session\`, path: /some/path, name: meh
+	      errors: none
+	  errors: none
 	- id: T8
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
-	    tracer notifications discarded: 0
 	  actions:
 	    snapshot session \`ze-session\`, rate policy: after every 10 occurrences
+	      errors: none
+	  errors: none
 	- id: T9
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
-	    tracer notifications discarded: 0
 	  actions:
 	    snapshot session \`ze-session\`, rate policy: once after 10 occurrences
+	      errors: none
+	  errors: none
 	EOF
 
-	list_triggers "snapshot action" "${tmp_expected_stdout}"
+	list_triggers_matches_ok "snapshot action" "${tmp_expected_stdout}"
 
 	stop_lttng_sessiond_notap
 }
@@ -391,31 +426,41 @@ test_notify_action ()
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
-	    tracer notifications discarded: 0
 	  actions:
 	    notify, rate policy: once after 5 occurrences
+	      errors: none
+	  errors: none
 	- id: T1
 	  user id: ${uid}
 	  condition: event rule hit
 	    rule: some-event (type: tracepoint, domain: ust)
-	    tracer notifications discarded: 0
 	  actions:
 	    notify, rate policy: after every 10 occurrences
+	      errors: none
+	  errors: none
 	EOF
 
-	list_triggers "snapshot action" "${tmp_expected_stdout}"
+	list_triggers_matches_ok "snapshot action" "${tmp_expected_stdout}"
 
-	stop_lttng_sessiond_notap
+	lttng_remove_trigger_ok "T0"
+	lttng_remove_trigger_ok "T1"
 }
 
+plan_tests $NUM_TESTS
+
+# shellcheck disable=SC2119
+start_lttng_sessiond_notap
+
 test_top_level_options
 test_on_event_tracepoint
-skip $ist_root "non-root user: skipping kprobe tests" 6 || test_on_event_probe
-skip $ist_root "non-root user: skipping uprobe tests" 4 || test_on_event_userspace_probe
-skip $ist_root "non-root user: skipping syscall tests" 5 || test_on_event_syscall
+skip $ist_root "non-root user: skipping kprobe tests" 9 || test_on_event_probe
+skip $ist_root "non-root user: skipping userspace probe elf tests" 5 || test_on_event_userspace_probe
+skip $ist_root "non-root user: skipping syscall tests" 7 || test_on_event_syscall
 test_snapshot_action
 test_notify_action
 
+stop_lttng_sessiond_notap
+
 # Cleanup
 rm -f "${tmp_stdout}"
 rm -f "${tmp_stderr}"