X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Fnotification.c;h=e7101bb9f69f6bc97de662f9df1187aeeb666108;hb=39ac0a0ee6d55413d4f4a800db811f5dae0ae4ae;hp=0f1a418112eefedb41401b5c89174b3c9baf4feb;hpb=d891bb526224eeaf1cf688e072c7bf77321c6c2f;p=lttng-tools.git

diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c
index 0f1a41811..e7101bb9f 100644
--- a/tests/regression/tools/notification/notification.c
+++ b/tests/regression/tools/notification/notification.c
@@ -1864,14 +1864,9 @@ static void test_kprobe_event_rule_notification(
 			lttng_session_daemon_notification_endpoint);
 	ok(notification_channel, "Notification channel object creation");
 
-	event_rule = lttng_event_rule_kernel_probe_create();
+	event_rule = lttng_event_rule_kernel_probe_create(location);
 	ok(event_rule, "kprobe event rule object creation");
 
-	event_rule_status = lttng_event_rule_kernel_probe_set_location(
-			event_rule, location);
-	ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK,
-			"Setting kprobe event rule location: '%s'", symbol_name);
-
 	event_rule_status = lttng_event_rule_kernel_probe_set_event_name(
 			event_rule, trigger_name);
 	ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK,
@@ -1978,15 +1973,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();
+	event_rule = lttng_event_rule_userspace_probe_create(probe_location);
 	ok(event_rule, "kprobe event rule object creation");
 
-	event_rule_status = lttng_event_rule_userspace_probe_set_location(
-			event_rule, probe_location);
-	ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK,
-			"Setting uprobe event rule location");
-
-	event_rule_status = lttng_event_rule_userspace_probe_set_name(
+	event_rule_status = lttng_event_rule_userspace_probe_set_event_name(
 			event_rule, trigger_name);
 	ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK,
 			"Setting uprobe event rule name: '%s'", trigger_name);
@@ -2316,7 +2306,7 @@ static int validator_notification_trigger_capture(
 {
 	int ret;
 	unsigned int capture_count, i;
-	enum lttng_evaluation_status evaluation_status;
+	enum lttng_evaluation_on_event_status on_event_evaluation_status;
 	enum lttng_event_field_value_status event_field_value_status;
 	const struct lttng_evaluation *evaluation;
 	const struct lttng_event_field_value *captured_fields;
@@ -2329,11 +2319,12 @@ static int validator_notification_trigger_capture(
 		goto end;
 	}
 
-	evaluation_status = lttng_evaluation_on_event_get_captured_values(
-			evaluation, &captured_fields);
-	if (evaluation_status != LTTNG_EVALUATION_STATUS_OK) {
+	on_event_evaluation_status =
+			lttng_evaluation_on_event_get_captured_values(
+					evaluation, &captured_fields);
+	if (on_event_evaluation_status != LTTNG_EVALUATION_ON_EVENT_STATUS_OK) {
 		diag("Failed to get event rule evaluation captured values: status = %d",
-				(int) evaluation_status);
+				(int) on_event_evaluation_status);
 		ret = 1;
 		goto end;
 	}
@@ -2600,7 +2591,7 @@ int main(int argc, const char *argv[])
 	}
 	case 4:
 	{
-		plan_tests(13);
+		plan_tests(12);
 		/* Test cases that need the kernel tracer. */
 		assert(domain_type == LTTNG_DOMAIN_KERNEL);
 
@@ -2633,7 +2624,7 @@ int main(int argc, const char *argv[])
 	{
 		const char *testapp_path, *test_symbol_name;
 
-		plan_tests(13);
+		plan_tests(12);
 
 		if (argc < 7) {
 			fail("Missing parameter for tests to run %d", argc);