X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_event_rule.c;h=49aade24d8bf184a8b457f7d5515f0bc4760c91d;hb=602a6d403fc83a01f2f21fffbd3951197eda91de;hp=6cc9d5cd63c7f73d93c40784c94e6ab42785ce20;hpb=1f1567a534b09badcbe6f6c10a4693e9fddb62dc;p=lttng-tools.git

diff --git a/tests/unit/test_event_rule.c b/tests/unit/test_event_rule.c
index 6cc9d5cd6..49aade24d 100644
--- a/tests/unit/test_event_rule.c
+++ b/tests/unit/test_event_rule.c
@@ -24,8 +24,8 @@
 #include <lttng/event-rule/syscall.h>
 #include <lttng/event-rule/tracepoint-internal.h>
 #include <lttng/event-rule/tracepoint.h>
-#include <lttng/event-rule/uprobe-internal.h>
-#include <lttng/event-rule/uprobe.h>
+#include <lttng/event-rule/userspace-probe-internal.h>
+#include <lttng/event-rule/userspace-probe.h>
 #include <lttng/event.h>
 #include <lttng/kernel-probe-internal.h>
 #include <lttng/kernel-probe.h>
@@ -37,7 +37,7 @@ int lttng_opt_quiet = 1;
 int lttng_opt_verbose;
 int lttng_opt_mi;
 
-#define NUM_TESTS 187
+#define NUM_TESTS 185
 
 struct tracepoint_test {
 	enum lttng_domain_type type;
@@ -323,21 +323,18 @@ static void test_event_rule_kernel_probe_by_location(
 
 	lttng_payload_init(&payload);
 
-	kprobe = lttng_event_rule_kernel_probe_create();
+	kprobe = lttng_event_rule_kernel_probe_create(location);
 	ok(kprobe, "kprobe event rule object creation.");
 
-	status = lttng_event_rule_kernel_probe_set_location(kprobe, location);
-	ok(status == LTTNG_EVENT_RULE_STATUS_OK,
-			"Setting kprobe event rule location.");
 	status = lttng_event_rule_kernel_probe_get_location(kprobe, &_location);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK,
 			"Getting kprobe event rule location.");
 	ok(lttng_kernel_probe_location_is_equal(location, _location), "Locations are equal.");
 
-	status = lttng_event_rule_kernel_probe_set_name(kprobe, probe_name);
+	status = lttng_event_rule_kernel_probe_set_event_name(kprobe, probe_name);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK,
 			"Setting kprobe event rule name: %s.", probe_name);
-	status = lttng_event_rule_kernel_probe_get_name(kprobe, &tmp);
+	status = lttng_event_rule_kernel_probe_get_event_name(kprobe, &tmp);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Getting kprobe name.");
 	ok(!strcmp(probe_name, tmp), "kprobe name are equal.");