X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Funit%2Ftest_event_rule.c;h=8d2ffe35f5488b2273cfb2b16d790885af5003fc;hb=d84633c4baef5c02b82c75bd25e859a2a7a96fe3;hp=6ec49fe66ec39570393cf2dfd5bd29d02d2993b8;hpb=213efb0ce7a2d225778edcce8a55cbe8ef11a572;p=lttng-tools.git

diff --git a/tests/unit/test_event_rule.c b/tests/unit/test_event_rule.c
index 6ec49fe66..8d2ffe35f 100644
--- a/tests/unit/test_event_rule.c
+++ b/tests/unit/test_event_rule.c
@@ -18,14 +18,14 @@
 #include <common/payload-view.h>
 #include <common/payload.h>
 #include <lttng/domain.h>
-#include <lttng/event-rule/kernel-probe-internal.h>
-#include <lttng/event-rule/kernel-probe.h>
+#include <lttng/event-rule/kernel-kprobe-internal.h>
+#include <lttng/event-rule/kernel-kprobe.h>
 #include <lttng/event-rule/kernel-syscall-internal.h>
 #include <lttng/event-rule/kernel-syscall.h>
 #include <lttng/event-rule/tracepoint-internal.h>
 #include <lttng/event-rule/tracepoint.h>
-#include <lttng/event-rule/userspace-probe-internal.h>
-#include <lttng/event-rule/userspace-probe.h>
+#include <lttng/event-rule/kernel-uprobe-internal.h>
+#include <lttng/event-rule/kernel-uprobe.h>
 #include <lttng/event.h>
 #include <lttng/kernel-probe-internal.h>
 #include <lttng/kernel-probe.h>
@@ -255,10 +255,10 @@ static void test_event_rule_userspace_probe(void)
 
 	lttng_payload_init(&payload);
 
-	uprobe = lttng_event_rule_userspace_probe_create(probe_location);
+	uprobe = lttng_event_rule_kernel_uprobe_create(probe_location);
 	ok(uprobe, "uprobe event rule object creation.");
 
-	status = lttng_event_rule_userspace_probe_get_location(
+	status = lttng_event_rule_kernel_uprobe_get_location(
 			uprobe, &probe_location_tmp);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK,
 			"Getting uprobe event rule location.");
@@ -266,10 +266,10 @@ static void test_event_rule_userspace_probe(void)
 			   probe_location, probe_location_tmp),
 			"Location is equal.");
 
-	status = lttng_event_rule_userspace_probe_set_event_name(uprobe, probe_name);
+	status = lttng_event_rule_kernel_uprobe_set_event_name(uprobe, probe_name);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK,
 			"Setting uprobe event rule name: %s.", probe_name);
-	status = lttng_event_rule_userspace_probe_get_event_name(uprobe, &tmp);
+	status = lttng_event_rule_kernel_uprobe_get_event_name(uprobe, &tmp);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Getting uprobe name.");
 	ok(!strcmp(probe_name, tmp), "Uprobe name are equal.");
 
@@ -313,18 +313,18 @@ static void test_event_rule_kernel_probe_by_location(
 
 	lttng_payload_init(&payload);
 
-	kprobe = lttng_event_rule_kernel_probe_create(location);
+	kprobe = lttng_event_rule_kernel_kprobe_create(location);
 	ok(kprobe, "kprobe event rule object creation.");
 
-	status = lttng_event_rule_kernel_probe_get_location(kprobe, &_location);
+	status = lttng_event_rule_kernel_kprobe_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_event_name(kprobe, probe_name);
+	status = lttng_event_rule_kernel_kprobe_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_event_name(kprobe, &tmp);
+	status = lttng_event_rule_kernel_kprobe_get_event_name(kprobe, &tmp);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Getting kprobe name.");
 	ok(!strcmp(probe_name, tmp), "kprobe name are equal.");