event-rule: userspace probe: force location on create

[lttng-tools.git] / tests / unit / test_event_rule.c

diff --git a/tests/unit/test_event_rule.c b/tests/unit/test_event_rule.c
index 07614f4b88e67ba057fdff507e6d99029568cc3e..72c37709faab7d5346e5fe6221ea2a974b231f7b 100644 (file)
--- a/tests/unit/test_event_rule.c
+++ b/tests/unit/test_event_rule.c
@@ -37,7 +37,7 @@ int lttng_opt_quiet = 1;
 int lttng_opt_verbose;
 int lttng_opt_mi;
 
-#define NUM_TESTS 187
+#define NUM_TESTS 184
 
 struct tracepoint_test {
        enum lttng_domain_type type;
@@ -261,13 +261,9 @@ static void test_event_rule_userspace_probe(void)
 
        lttng_payload_init(&payload);
 
-       uprobe = lttng_event_rule_userspace_probe_create();
+       uprobe = lttng_event_rule_userspace_probe_create(probe_location);
        ok(uprobe, "uprobe event rule object creation.");
 
-       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_userspace_probe_get_location(
                        uprobe, &probe_location_tmp);
        ok(status == LTTNG_EVENT_RULE_STATUS_OK,
@@ -276,10 +272,10 @@ static void test_event_rule_userspace_probe(void)
                           probe_location, probe_location_tmp),
                        "Location is equal.");
 
-       status = lttng_event_rule_userspace_probe_set_name(uprobe, probe_name);
+       status = lttng_event_rule_userspace_probe_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_name(uprobe, &tmp);
+       status = lttng_event_rule_userspace_probe_get_event_name(uprobe, &tmp);
        ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Getting uprobe name.");
        ok(!strcmp(probe_name, tmp), "Uprobe name are equal.");
 
@@ -323,12 +319,9 @@ 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.");