Rename lttng_event_rule_kernel_probe to lttng_event_rule_kernel_kprobe

[lttng-tools.git] / tests / regression / tools / trigger / test_list_triggers_cli

diff --git a/tests/regression/tools/trigger/test_list_triggers_cli b/tests/regression/tools/trigger/test_list_triggers_cli
index 26f2f9f46e4b53d0167f478485df57431bf75508..5366a030ccc1434347a05aab15dff6c6a7da9176 100755 (executable)
--- a/tests/regression/tools/trigger/test_list_triggers_cli
+++ b/tests/regression/tools/trigger/test_list_triggers_cli
@@ -225,7 +225,7 @@ test_event_rule_matches_probe ()
        - name: T0
          owner uid: ${uid}
          condition: event rule matches
-           rule: my_channel_enable (type: probe, location: lttng_channel_enable)
+           rule: my_channel_enable (type: kernel:kprobe, location: lttng_channel_enable)
          actions:
            notify
              errors: none
@@ -233,7 +233,7 @@ test_event_rule_matches_probe ()
        - name: T1
          owner uid: ${uid}
          condition: event rule matches
-           rule: my_channel_enable (type: probe, location: ${base_symbol}+${offset_hex})
+           rule: my_channel_enable (type: kernel:kprobe, location: ${base_symbol}+${offset_hex})
          actions:
            notify
              errors: none
@@ -241,7 +241,7 @@ test_event_rule_matches_probe ()
        - name: T2
          owner uid: ${uid}
          condition: event rule matches
-           rule: my_channel_enable (type: probe, location: 0x${channel_enable_addr})
+           rule: my_channel_enable (type: kernel:kprobe, location: 0x${channel_enable_addr})
          actions:
            notify
              errors: none
@@ -261,13 +261,13 @@ test_event_rule_matches_userspace_probe_elf ()
 
        diag "Listing event-rule-matches userspace-probe elf"
 
-       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
+       lttng_add_trigger_ok "T0" --condition event-rule-matches --domain=kernel --type=kernel:uprobe --location=${uprobe_elf_binary}:test_function --event-name=ma-probe-elf --action notify
 
        cat > "${tmp_expected_stdout}" <<- EOF
        - name: T0
          owner uid: ${uid}
          condition: event rule matches
-           rule: ma-probe-elf (type: userspace probe, location type: ELF, location: ${uprobe_elf_binary}:${elf_function_name})
+           rule: ma-probe-elf (type: kernel:uprobe, location type: ELF, location: ${uprobe_elf_binary}:${elf_function_name})
          actions:
            notify
              errors: none
@@ -286,13 +286,13 @@ test_event_rule_matches_userspace_probe_sdt ()
 
        diag "Listing event-rule-matches userspace-probe sdt"
 
-       lttng_add_trigger_ok "T0" --condition event-rule-matches --domain=kernel --type=uprobe --location=sdt:${uprobe_sdt_binary}:${sdt_provider_name}:${sdt_probe_name} --event-name=ma-probe-sdt --action notify
+       lttng_add_trigger_ok "T0" --condition event-rule-matches --domain=kernel --type=kernel:uprobe --location=sdt:${uprobe_sdt_binary}:${sdt_provider_name}:${sdt_probe_name} --event-name=ma-probe-sdt --action notify
 
        cat > "${tmp_expected_stdout}" <<- EOF
        - name: T0
          owner uid: 0
          condition: event rule matches
-           rule: ma-probe-sdt (type: userspace probe, location type: SDT, location: ${uprobe_sdt_binary}:${sdt_provider_name}:${sdt_probe_name})
+           rule: ma-probe-sdt (type: kernel:uprobe, location type: SDT, location: ${uprobe_sdt_binary}:${sdt_provider_name}:${sdt_probe_name})
          actions:
            notify
              errors: none
@@ -318,7 +318,7 @@ test_event_rule_matches_syscall ()
        - name: T0
          owner uid: ${uid}
          condition: event rule matches
-           rule: open (type: syscall:entry+exit)
+           rule: open (type: kernel:syscall:entry+exit)
          actions:
            notify
              errors: none
@@ -326,7 +326,7 @@ test_event_rule_matches_syscall ()
        - name: T1
          owner uid: ${uid}
          condition: event rule matches
-           rule: open (type: syscall:entry)
+           rule: open (type: kernel:syscall:entry)
          actions:
            notify
              errors: none
@@ -334,7 +334,7 @@ test_event_rule_matches_syscall ()
        - name: T2
          owner uid: ${uid}
          condition: event rule matches
-           rule: open (type: syscall:exit)
+           rule: open (type: kernel:syscall:exit)
          actions:
            notify
              errors: none
@@ -342,7 +342,7 @@ test_event_rule_matches_syscall ()
        - name: T3
          owner uid: ${uid}
          condition: event rule matches
-           rule: open (type: syscall:entry+exit)
+           rule: open (type: kernel:syscall:entry+exit)
          actions:
            notify
              errors: none
@@ -350,7 +350,7 @@ test_event_rule_matches_syscall ()
        - name: T4
          owner uid: ${uid}
          condition: event rule matches
-           rule: ptrace (type: syscall:entry+exit, filter: a > 2)
+           rule: ptrace (type: kernel:syscall:entry+exit, filter: a > 2)
          actions:
            notify
              errors: none