X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_ust_data.c;h=f92b1f802b7481b415aae1834ae2475b02e070c3;hp=cea322d32ddaf3a8f6bd07eb695772653758266a;hb=fc4b93fa8aa36b19caad0f8dc4a6a3237fcc36bf;hpb=92816cc33a1add3c8276839bd6335e17423577dd

diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c
index cea322d32..f92b1f802 100644
--- 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>
@@ -47,22 +36,12 @@ int lttng_opt_quiet = 1;
 int lttng_opt_verbose;
 int lttng_opt_mi;
 
-int ust_consumerd32_fd;
-int ust_consumerd64_fd;
-
-/* Global variables required by sessiond objects being linked-in */
-struct lttng_ht *agent_apps_ht_by_sock;
-struct notification_thread_handle *notification_thread_handle;
-
 static const char alphanum[] =
 	"0123456789"
 	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 	"abcdefghijklmnopqrstuvwxyz";
 static char random_string[RANDOM_STRING_LEN];
 
-static struct ltt_ust_session *usess;
-static struct lttng_domain dom;
-
 /*
  * Return random string of 10 characters.
  * Not thread-safe.
@@ -82,9 +61,9 @@ static char *get_random_string(void)
 
 static void test_create_one_ust_session(void)
 {
-	dom.type = LTTNG_DOMAIN_UST;
+	struct ltt_ust_session *usess =
+		trace_ust_create_session(42);
 
-	usess = trace_ust_create_session(42);
 	ok(usess != NULL, "Create UST session");
 
 	if (!usess) {
@@ -117,14 +96,14 @@ static void test_create_ust_channel(void)
 	uchan = trace_ust_create_channel(&attr, LTTNG_DOMAIN_UST);
 	ok(uchan != NULL, "Create UST channel");
 
-	if (!usess) {
-		skip(1, "UST session is null");
+	if (!uchan) {
+		skip(1, "UST channel is null");
 		return;
 	}
 
 	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,
@@ -156,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);
@@ -250,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);
@@ -277,8 +256,12 @@ static void test_create_ust_context(void)
 	uctx = trace_ust_create_context(&ectx);
 	ok(uctx != NULL, "Create UST context");
 
-	ok((int) uctx->ctx.ctx == LTTNG_UST_CONTEXT_VTID,
-	   "Validate UST context");
+	if (uctx) {
+		ok((int) uctx->ctx.ctx == LTTNG_UST_ABI_CONTEXT_VTID,
+		   "Validate UST context");
+	} else {
+		skip(1, "Skipping UST context validation as creation failed");
+	}
 	free(uctx);
 }