event-rule: userspace probe: force location on create

[lttng-tools.git] / tests / regression / tools / notification / notification.c

diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c
index b701681c089dfd2d0f83807baa0bc606b62bcc79..68a76f922a08ded50d602ca606a235300c76c9b5 100644 (file)
--- a/tests/regression/tools/notification/notification.c
+++ b/tests/regression/tools/notification/notification.c
@@ -589,12 +589,12 @@ static const char *get_notification_trigger_name(
        }
 
        switch (lttng_evaluation_get_type(evaluation)) {
-       case LTTNG_CONDITION_TYPE_EVENT_RULE_HIT:
+       case LTTNG_CONDITION_TYPE_ON_EVENT:
        {
-               status = lttng_evaluation_event_rule_get_trigger_name(
+               status = lttng_evaluation_on_event_get_trigger_name(
                                evaluation, &name);
                if (status != LTTNG_EVALUATION_STATUS_OK) {
-                       fail("lttng_evaluation_event_rule_get_trigger_name");
+                       fail("lttng_evaluation_on_event_get_trigger_name");
                        name = NULL;
                        goto end;
                }
@@ -1504,7 +1504,7 @@ static void create_tracepoint_event_rule_trigger(const char *event_pattern,
                ok(success, "Setting tracepoint event rule exclusions");
        }
 
-       tmp_condition = lttng_condition_event_rule_create(event_rule);
+       tmp_condition = lttng_condition_on_event_create(event_rule);
        ok(tmp_condition, "Condition event rule object creation");
 
        if (capture_desc_cb) {
@@ -1864,20 +1864,15 @@ 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_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,
                        "Setting kprobe event rule name: '%s'", trigger_name);
 
-       condition = lttng_condition_event_rule_create(event_rule);
+       condition = lttng_condition_on_event_create(event_rule);
        ok(condition, "Condition event rule object creation");
 
        /* Register the trigger for condition. */
@@ -1978,20 +1973,15 @@ 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);
 
-       condition = lttng_condition_event_rule_create(event_rule);
+       condition = lttng_condition_on_event_create(event_rule);
        ok(condition, "Condition event rule object creation");
 
        /* Register the trigger for condition. */
@@ -2083,7 +2073,7 @@ static void test_syscall_event_rule_notification(
        ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK,
                        "Setting syscall event rule pattern: '%s'", syscall_name);
 
-       condition = lttng_condition_event_rule_create(event_rule);
+       condition = lttng_condition_on_event_create(event_rule);
        ok(condition, "Condition syscall event rule object creation");
 
        /* Register the trigger for condition. */
@@ -2178,7 +2168,7 @@ static void test_syscall_event_rule_notification_filter(
        ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK,
                        "Setting filter: '%s'", filter_pattern);
 
-       condition = lttng_condition_event_rule_create(event_rule);
+       condition = lttng_condition_on_event_create(event_rule);
        ok(condition, "Condition event rule object creation");
 
        /* Register the triggers for condition */
@@ -2293,7 +2283,7 @@ static int generate_capture_descr(struct lttng_condition *condition)
                        goto end;
                }
 
-               cond_status = lttng_condition_event_rule_append_capture_descriptor(
+               cond_status = lttng_condition_on_event_append_capture_descriptor(
                                condition, expr);
                if (cond_status != LTTNG_CONDITION_STATUS_OK) {
                        fail("Failed to append capture descriptor");
@@ -2329,7 +2319,7 @@ static int validator_notification_trigger_capture(
                goto end;
        }
 
-       evaluation_status = lttng_evaluation_event_rule_get_captured_values(
+       evaluation_status = lttng_evaluation_on_event_get_captured_values(
                        evaluation, &captured_fields);
        if (evaluation_status != LTTNG_EVALUATION_STATUS_OK) {
                diag("Failed to get event rule evaluation captured values: status = %d",
@@ -2600,7 +2590,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 +2623,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);