Adapt to lttng-ust ust-abi.h naming prefix update

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

diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c
index a900d1274e44effe84f50de7a9691e2fcdf1cec3..f92b1f802b7481b415aae1834ae2475b02e070c3 100644 (file)
--- a/tests/unit/test_ust_data.c
+++ b/tests/unit/test_ust_data.c
@@ -1,23 +1,11 @@
 /*
- * Copyright (c)  2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <assert.h>
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -28,6 +16,7 @@
 #include <lttng/lttng.h>
 #include <bin/lttng-sessiond/lttng-ust-abi.h>
 #include <common/defaults.h>
+#include <common/compat/errno.h>
 #include <bin/lttng-sessiond/trace-ust.h>
 #include <bin/lttng-sessiond/ust-app.h>
 #include <bin/lttng-sessiond/notification-thread.h>
@@ -114,7 +103,7 @@ static void test_create_ust_channel(void)
 
        ok(uchan->enabled == 0 &&
           strncmp(uchan->name, "channel0", 8) == 0 &&
-          uchan->name[LTTNG_UST_SYM_NAME_LEN - 1] == '\0' &&
+          uchan->name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] == '\0' &&
           uchan->ctx != NULL &&
           uchan->events != NULL &&
           uchan->attr.overwrite  == attr.attr.overwrite,
@@ -146,9 +135,9 @@ static void test_create_ust_event(void)
        }
 
        ok(event->enabled == 0 &&
-          event->attr.instrumentation == LTTNG_UST_TRACEPOINT &&
+          event->attr.instrumentation == LTTNG_UST_ABI_TRACEPOINT &&
           strcmp(event->attr.name, ev.name) == 0 &&
-          event->attr.name[LTTNG_UST_SYM_NAME_LEN - 1] == '\0',
+          event->attr.name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] == '\0',
           "Validate UST event");
 
        trace_ust_destroy_event(event);
@@ -240,13 +229,13 @@ static void test_create_ust_event_exclusion(void)
        }
 
        ok(event->enabled == 0 &&
-               event->attr.instrumentation == LTTNG_UST_TRACEPOINT &&
+               event->attr.instrumentation == LTTNG_UST_ABI_TRACEPOINT &&
                strcmp(event->attr.name, ev.name) == 0 &&
                event->exclusion != NULL &&
                event->exclusion->count == exclusion_count &&
                !memcmp(event->exclusion->names, exclusion_copy->names,
                        LTTNG_SYMBOL_NAME_LEN * exclusion_count) &&
-               event->attr.name[LTTNG_UST_SYM_NAME_LEN - 1] == '\0',
+               event->attr.name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] == '\0',
                "Validate UST event and exclusion");
 
        trace_ust_destroy_event(event);
@@ -268,7 +257,7 @@ static void test_create_ust_context(void)
        ok(uctx != NULL, "Create UST context");
 
        if (uctx) {
-               ok((int) uctx->ctx.ctx == LTTNG_UST_CONTEXT_VTID,
+               ok((int) uctx->ctx.ctx == LTTNG_UST_ABI_CONTEXT_VTID,
                   "Validate UST context");
        } else {
                skip(1, "Skipping UST context validation as creation failed");