X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ftrigger%2Ftest_add_trigger_cli;h=01859ee74f7ac520fccd641389e7a1e55797e57d;hb=85522de5747fee084e2e391678a79918355345da;hp=029f17cef6d139722a319b909aba8fdb0d4824bc;hpb=4f7da553ae57a6c947da2b9668c06418b2d50e99;p=lttng-tools.git

diff --git a/tests/regression/tools/trigger/test_add_trigger_cli b/tests/regression/tools/trigger/test_add_trigger_cli
index 029f17cef..01859ee74 100755
--- a/tests/regression/tools/trigger/test_add_trigger_cli
+++ b/tests/regression/tools/trigger/test_add_trigger_cli
@@ -23,7 +23,7 @@ TESTDIR="$CURDIR/../../.."
 # shellcheck source=../../../utils/utils.sh
 source "$TESTDIR/utils/utils.sh"
 
-plan_tests 297
+plan_tests 288
 
 FULL_LTTNG_BIN="${TESTDIR}/../src/bin/lttng/${LTTNG_BIN}"
 
@@ -147,7 +147,7 @@ test_success "--exclude-name two" \
 	--action notify
 
 skip $ist_root "non-root user: skipping kprobe tests" 18 || {
-	for type in kprobe kernel-probe; do
+	for type in kprobe kernel:kprobe; do
 		test_success "--condition event-rule-matches probe by symbol" \
 			--condition event-rule-matches --domain=kernel --type=$type --location=lttng_channel_enable --event-name=my_channel_enable \
 			--action notify
@@ -178,16 +178,14 @@ skip $ist_root "non-root user: skipping kprobe tests" 18 || {
 	done
 }
 
-skip $ist_root "non-root user: skipping uprobe tests" 12 || {
-	for type in uprobe userspace-probe; do
-		test_success "--condition event-rule-matches uprobe" \
-			--condition event-rule-matches --domain=kernel --type=$type --location=${uprobe_elf_binary}:test_function --event-name=ma-probe \
-			--action notify
+skip $ist_root "non-root user: skipping uprobe tests" 6 || {
+	test_success "--condition event-rule-matches uprobe" \
+		--condition event-rule-matches --domain=kernel --type=kernel:uprobe --location=${uprobe_elf_binary}:test_function --event-name=ma-probe \
+		--action notify
 
-		test_success "--condition event-rule-matches uprobe with elf prefix" \
-			--condition event-rule-matches --domain=kernel --type=$type --location=elf:${uprobe_elf_binary}:test_function --event-name=ma-probe-2 \
-			--action notify
-	done
+	test_success "--condition event-rule-matches uprobe with elf prefix" \
+		--condition event-rule-matches --domain=kernel --type=kernel:uprobe --location=elf:${uprobe_elf_binary}:test_function --event-name=ma-probe-2 \
+		--action notify
 }
 
 skip $ist_root "non-root user: skipping syscall tests" 30 || {
@@ -366,9 +364,9 @@ test_failure "two different --domain" \
 	"Error: More than one \`--domain\` was specified." \
 	--condition event-rule-matches --domain=user --domain=kernel
 
-for type in kprobe kernel-probe; do
+for type in kprobe kernel:kprobe; do
 	test_failure "--condition event-rule-matches: --name with --type=$type" \
-		"Error: Can't use --name with probe event rules." \
+		"Error: Can't use --name with kernel kprobe event rules." \
 		--condition event-rule-matches --type=$type --location=do_sys_open --name='hello'
 done
 
@@ -380,11 +378,9 @@ test_failure "--condition event-rule-matches: --event-name with tracepoint event
 	"Error: Can't use --event-name with tracepoint event rules." \
 	--condition event-rule-matches --domain=user --event-name='hello'
 
-for type in uprobe userspace-probe; do
-	test_failure "--condition event-rule-matches: extra argument with --type=$type" \
-		"Error: Unexpected argument 'hello'" \
-		--condition event-rule-matches --domain=kernel --type=$type --location=${uprobe_elf_binary}:test_failure hello
-done
+test_failure "--condition event-rule-matches: extra argument with --type=kernel:uprobe" \
+	"Error: Unexpected argument 'hello'" \
+	--condition event-rule-matches --domain=kernel --type=$type --location=${uprobe_elf_binary}:test_failure hello
 
 test_failure "--condition event-rule-matches: extra argument with --type=syscall" \
 	"Error: Unexpected argument 'open'" \