X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Ftest_notification_notifier_discarded_count;h=5df86d60504368184f872a81687bad4cc205db87;hp=2186bfb2ce4d6703f9fe8a917be9b32f758c674b;hb=64c34630769271a77e5eb8254452e466809ce4d9;hpb=96bb1ae87edd50f631cc845c76ca08cedae8c59f

diff --git a/tests/regression/tools/notification/test_notification_notifier_discarded_count b/tests/regression/tools/notification/test_notification_notifier_discarded_count
index 2186bfb2c..5df86d605 100755
--- a/tests/regression/tools/notification/test_notification_notifier_discarded_count
+++ b/tests/regression/tools/notification/test_notification_notifier_discarded_count
@@ -78,7 +78,7 @@ function test_kernel_notifier_discarded_count
 	done
 
 	lttng_add_trigger_ok "$trigger_name" \
-		--condition on-event --kernel lttng_test_filter_event \
+		--condition event-rule-matches --domain=kernel --name=lttng_test_filter_event \
 		--action notify
 
 	trigger_discarded_nb=$(trigger_get_discarded_notif_number "$trigger_name")
@@ -103,11 +103,11 @@ function test_kernel_notifier_discarded_count
 
 	# Confirm that no notifier is enabled.
 	list_triggers_line_count=$("$FULL_LTTNG_BIN" list-triggers | wc -l)
-	is "$list_triggers_line_count" "0" "No \`on-event\` kernel notifier enabled as expected"
+	is "$list_triggers_line_count" "0" "No \`event-rule-matches\` kernel notifier enabled as expected"
 
 	# Enable another notifier and list it to confirm the counter was cleared.
 	lttng_add_trigger_ok "$trigger_name" \
-		--condition on-event --kernel lttng_test_filter_event \
+		--condition event-rule-matches --domain=kernel --name=lttng_test_filter_event \
 		--action notify
 
 	trigger_discarded_nb=$(trigger_get_discarded_notif_number "$trigger_name")
@@ -129,13 +129,13 @@ function test_kernel_notifier_discarded_count_max_bucket
 	diag "Kernel event notifer error counter bucket limit"
 	for i in $(seq 3); do
 		lttng_add_trigger_ok "$i" \
-			--condition on-event --kernel my_event_that_doesnt_need_to_really_exist_$i \
+			--condition event-rule-matches --domain=kernel --name=my_event_that_doesnt_need_to_really_exist_$i \
 			--action notify
 	done
 
 	for i in $(seq 4 5); do
 		lttng_add_trigger_fail "$i" \
-			--condition on-event --kernel my_event_that_doesnt_need_to_really_exist_$i \
+			--condition event-rule-matches --domain=kernel --name=my_event_that_doesnt_need_to_really_exist_$i \
 			--action notify
 	done
 
@@ -180,7 +180,7 @@ function test_ust_notifier_discarded_count
 	done
 
 	lttng_add_trigger_ok "$trigger_name" \
-		--condition on-event --userspace tp:tptest \
+		--condition event-rule-matches --domain=user --name=tp:tptest \
 		--action notify
 
 	trigger_discarded_nb=$(trigger_get_discarded_notif_number "$trigger_name")
@@ -202,11 +202,11 @@ function test_ust_notifier_discarded_count
 
 	# Confirm that no notifier is enabled.
 	list_triggers_line_count=$("$FULL_LTTNG_BIN" list-triggers | wc -l)
-	is "$list_triggers_line_count" "0" "No \`on-event\` userspace notifier enabled as expected"
+	is "$list_triggers_line_count" "0" "No \`event-rule-matches\` userspace notifier enabled as expected"
 
 	# Enable another notifier and list it to confirm the counter was cleared.
 	lttng_add_trigger_ok "$trigger_name" \
-		--condition on-event --userspace tp:tptest \
+		--condition event-rule-matches --domain=user --name=tp:tptest \
 		--action notify
 
 	trigger_discarded_nb=$(trigger_get_discarded_notif_number "$trigger_name")
@@ -226,13 +226,13 @@ function test_ust_notifier_discarded_count_max_bucket
 	diag "UST event notifer error counter bucket limit"
 	for i in $(seq 3); do
 		lttng_add_trigger_ok "$i" \
-			--condition on-event --userspace my_event_that_doesnt_need_to_really_exist_$i \
+			--condition event-rule-matches --domain=user --name=my_event_that_doesnt_need_to_really_exist_$i \
 			--action notify
 	done
 
 	for i in $(seq 4 5); do
 		lttng_add_trigger_fail "$i" \
-			--condition on-event --userspace my_event_that_doesnt_need_to_really_exist_$i \
+			--condition event-rule-matches --domain=user --name=my_event_that_doesnt_need_to_really_exist_$i \
 			--action notify
 	done