X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_event_rule.c;h=07614f4b88e67ba057fdff507e6d99029568cc3e;hp=7ed1a8bbf799294043605a3084c9deb31d9e5830;hb=d891bb526224eeaf1cf688e072c7bf77321c6c2f;hpb=f27911615bc5907d61d8ea236da974090bd85d24

diff --git a/tests/unit/test_event_rule.c b/tests/unit/test_event_rule.c
index 7ed1a8bbf..07614f4b8 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/kprobe-internal.h>
-#include <lttng/event-rule/kprobe.h>
+#include <lttng/event-rule/kernel-probe-internal.h>
+#include <lttng/event-rule/kernel-probe.h>
 #include <lttng/event-rule/syscall-internal.h>
 #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>
@@ -225,7 +225,7 @@ static void test_event_rule_syscall(void)
 	lttng_event_rule_destroy(syscall_from_buffer);
 }
 
-static void test_event_rule_uprobe(void)
+static void test_event_rule_userspace_probe(void)
 {
 	struct lttng_event_rule *uprobe = NULL;
 	struct lttng_event_rule *uprobe_from_buffer = NULL;
@@ -261,14 +261,14 @@ static void test_event_rule_uprobe(void)
 
 	lttng_payload_init(&payload);
 
-	uprobe = lttng_event_rule_uprobe_create();
+	uprobe = lttng_event_rule_userspace_probe_create();
 	ok(uprobe, "uprobe event rule object creation.");
 
-	status = lttng_event_rule_uprobe_set_location(uprobe, probe_location);
+	status = lttng_event_rule_userspace_probe_set_location(uprobe, probe_location);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK,
 			"Setting uprobe event rule location.");
 
-	status = lttng_event_rule_uprobe_get_location(
+	status = lttng_event_rule_userspace_probe_get_location(
 			uprobe, &probe_location_tmp);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK,
 			"Getting uprobe event rule location.");
@@ -276,10 +276,10 @@ static void test_event_rule_uprobe(void)
 			   probe_location, probe_location_tmp),
 			"Location is equal.");
 
-	status = lttng_event_rule_uprobe_set_name(uprobe, probe_name);
+	status = lttng_event_rule_userspace_probe_set_name(uprobe, probe_name);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK,
 			"Setting uprobe event rule name: %s.", probe_name);
-	status = lttng_event_rule_uprobe_get_name(uprobe, &tmp);
+	status = lttng_event_rule_userspace_probe_get_name(uprobe, &tmp);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Getting uprobe name.");
 	ok(!strcmp(probe_name, tmp), "Uprobe name are equal.");
 
@@ -334,10 +334,10 @@ static void test_event_rule_kernel_probe_by_location(
 			"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.");
 
@@ -383,7 +383,7 @@ int main(int argc, const char *argv[])
 	plan_tests(NUM_TESTS);
 	test_event_rule_tracepoint();
 	test_event_rule_syscall();
-	test_event_rule_uprobe();
+	test_event_rule_userspace_probe();
 	test_event_rule_kernel_probe();
 	return exit_status();
 }