X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Fnotification.c;h=aa42d5ef2f9584aad2d8b3cf6796d0917899bb82;hb=46fd07accf36998fca3e43e54513755a98f68f48;hp=092ac5f1ec5e978fafbdaf89467bf3eb3ac2c6ee;hpb=a5c2d2a71919b8d1542b62f6d32579125cc2c8f8;p=lttng-tools.git

diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c
index 092ac5f1e..aa42d5ef2 100644
--- a/tests/regression/tools/notification/notification.c
+++ b/tests/regression/tools/notification/notification.c
@@ -1220,7 +1220,8 @@ static void test_subscription_twice(const char *session_name,
 			domain_type, BUFFER_USAGE_TYPE_LOW, 0.99, &condition,
 			&action, &trigger);
 	if (ret) {
-		fail("Setup error on trigger registration");
+		fail("Setup error on trigger registration in %s()",
+				__FUNCTION__);
 		goto end;
 	}
 
@@ -1245,7 +1246,11 @@ static void test_subscription_twice(const char *session_name,
 			"Subscribe to a condition for which subscription was already done");
 
 end:
-	lttng_unregister_trigger(trigger);
+	ret = lttng_unregister_trigger(trigger);
+	if (ret) {
+		fail("Failed to unregister trigger in %s()", __FUNCTION__);
+	}
+
 	lttng_trigger_destroy(trigger);
 	lttng_notification_channel_destroy(notification_channel);
 	lttng_action_destroy(action);
@@ -1464,7 +1469,7 @@ static void create_tracepoint_event_rule_trigger(const char *event_pattern,
 	event_rule = lttng_event_rule_tracepoint_create(domain_type);
 	ok(event_rule, "Tracepoint event rule object creation");
 
-	event_rule_status = lttng_event_rule_tracepoint_set_pattern(
+	event_rule_status = lttng_event_rule_tracepoint_set_name_pattern(
 			event_rule, event_pattern);
 	ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK,
 			"Setting tracepoint event rule pattern: '%s'",
@@ -1487,7 +1492,7 @@ static void create_tracepoint_event_rule_trigger(const char *event_pattern,
 
 		for (i = 0; i < exclusion_count; i++) {
 			event_rule_status =
-					lttng_event_rule_tracepoint_add_exclusion(
+					lttng_event_rule_tracepoint_add_name_pattern_exclusion(
 							event_rule,
 							exclusions[i]);
 			if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
@@ -1961,10 +1966,10 @@ static void test_uprobe_event_rule_notification(
 			lttng_session_daemon_notification_endpoint);
 	ok(notification_channel, "Notification channel object creation");
 
-	event_rule = lttng_event_rule_userspace_probe_create(probe_location);
+	event_rule = lttng_event_rule_kernel_uprobe_create(probe_location);
 	ok(event_rule, "kprobe event rule object creation");
 
-	event_rule_status = lttng_event_rule_userspace_probe_set_event_name(
+	event_rule_status = lttng_event_rule_kernel_uprobe_set_event_name(
 			event_rule, trigger_name);
 	ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK,
 			"Setting uprobe event rule name: '%s'", trigger_name);
@@ -2049,10 +2054,10 @@ static void test_syscall_event_rule_notification(
 			lttng_session_daemon_notification_endpoint);
 	ok(notification_channel, "Notification channel object creation");
 
-	event_rule = lttng_event_rule_syscall_create(LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY);
+	event_rule = lttng_event_rule_kernel_syscall_create(LTTNG_EVENT_RULE_KERNEL_SYSCALL_EMISSION_SITE_ENTRY);
 	ok(event_rule, "syscall event rule object creation");
 
-	event_rule_status = lttng_event_rule_syscall_set_pattern(
+	event_rule_status = lttng_event_rule_kernel_syscall_set_name_pattern(
 			event_rule, syscall_name);
 	ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK,
 			"Setting syscall event rule pattern: '%s'", syscall_name);
@@ -2135,15 +2140,15 @@ static void test_syscall_event_rule_notification_filter(
 			lttng_session_daemon_notification_endpoint);
 	ok(notification_channel, "Notification channel object creation");
 
-	event_rule = lttng_event_rule_syscall_create(LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY);
+	event_rule = lttng_event_rule_kernel_syscall_create(LTTNG_EVENT_RULE_KERNEL_SYSCALL_EMISSION_SITE_ENTRY);
 	ok(event_rule, "syscall event rule object creation");
 
-	event_rule_status = lttng_event_rule_syscall_set_pattern(
+	event_rule_status = lttng_event_rule_kernel_syscall_set_name_pattern(
 			event_rule, syscall_name);
 	ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK,
 			"Setting syscall event rule pattern: '%s'", syscall_name);
 
-	event_rule_status = lttng_event_rule_syscall_set_filter(
+	event_rule_status = lttng_event_rule_kernel_syscall_set_filter(
 			event_rule, filter_pattern);
 	ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK,
 			"Setting filter: '%s'", filter_pattern);
@@ -2569,7 +2574,7 @@ int main(int argc, const char *argv[])
 	}
 	case 4:
 	{
-		plan_tests(12);
+		plan_tests(11);
 		/* Test cases that need the kernel tracer. */
 		assert(domain_type == LTTNG_DOMAIN_KERNEL);
 
@@ -2582,7 +2587,7 @@ int main(int argc, const char *argv[])
 	}
 	case 5:
 	{
-		plan_tests(25);
+		plan_tests(23);
 		/* Test cases that need the kernel tracer. */
 		assert(domain_type == LTTNG_DOMAIN_KERNEL);
 
@@ -2602,7 +2607,7 @@ int main(int argc, const char *argv[])
 	{
 		const char *testapp_path, *test_symbol_name;
 
-		plan_tests(12);
+		plan_tests(11);
 
 		if (argc < 7) {
 			fail("Missing parameter for tests to run %d", argc);
@@ -2629,7 +2634,7 @@ int main(int argc, const char *argv[])
 			plan_tests(221);
 			break;
 		case LTTNG_DOMAIN_KERNEL:
-			plan_tests(216);
+			plan_tests(215);
 			break;
 		default:
 			assert(0);