on-event evaluation: introduce on-event evaluation specific status code

[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 5f75334538504d43abd8741e548602792fb766a1..e7101bb9f69f6bc97de662f9df1187aeeb666108 100644 (file)
--- a/tests/regression/tools/notification/notification.c
+++ b/tests/regression/tools/notification/notification.c
@@ -1973,14 +1973,9 @@ 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_event_name(
                        event_rule, trigger_name);
        ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK,
@@ -2311,7 +2306,7 @@ static int validator_notification_trigger_capture(
 {
        int ret;
        unsigned int capture_count, i;
-       enum lttng_evaluation_status evaluation_status;
+       enum lttng_evaluation_on_event_status on_event_evaluation_status;
        enum lttng_event_field_value_status event_field_value_status;
        const struct lttng_evaluation *evaluation;
        const struct lttng_event_field_value *captured_fields;
@@ -2324,11 +2319,12 @@ static int validator_notification_trigger_capture(
                goto end;
        }
 
-       evaluation_status = lttng_evaluation_on_event_get_captured_values(
-                       evaluation, &captured_fields);
-       if (evaluation_status != LTTNG_EVALUATION_STATUS_OK) {
+       on_event_evaluation_status =
+                       lttng_evaluation_on_event_get_captured_values(
+                                       evaluation, &captured_fields);
+       if (on_event_evaluation_status != LTTNG_EVALUATION_ON_EVENT_STATUS_OK) {
                diag("Failed to get event rule evaluation captured values: status = %d",
-                               (int) evaluation_status);
+                               (int) on_event_evaluation_status);
                ret = 1;
                goto end;
        }
@@ -2628,7 +2624,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);