X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_ust_data.c;h=7996b8e60e7d4e9ce60cea4220e44a357692d6ce;hp=d81169572d0f6cd85a6f36836635382cf7f6fe8e;hb=8273250bde9f8fa0cc2f6d8ea86aaf4b9fe83fc1;hpb=61a046d9171d0c59a27588191eaa807c32737b5d

diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c
index d81169572..7996b8e60 100644
--- a/tests/unit/test_ust_data.c
+++ b/tests/unit/test_ust_data.c
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
+#include <urcu.h>
 
 #include <lttng/lttng.h>
 #include <bin/lttng-sessiond/lttng-ust-abi.h>
@@ -38,7 +39,7 @@
 #define RANDOM_STRING_LEN	11
 
 /* Number of TAP tests in this file */
-#define NUM_TESTS 15
+#define NUM_TESTS 16
 
 /* For error.h */
 int lttng_opt_quiet = 1;
@@ -84,6 +85,11 @@ static void test_create_one_ust_session(void)
 	usess = trace_ust_create_session(42);
 	ok(usess != NULL, "Create UST session");
 
+	if (!usess) {
+		skip(1, "UST session is null");
+		return;
+	}
+
 	ok(usess->id == 42 &&
 	   usess->active == 0 &&
 	   usess->domain_global.channels != NULL &&
@@ -106,6 +112,11 @@ 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");
+		return;
+	}
+
 	ok(uchan->enabled == 0 &&
 	   strncmp(uchan->name, "channel0", 8) == 0 &&
 	   uchan->name[LTTNG_UST_SYM_NAME_LEN - 1] == '\0' &&
@@ -133,6 +144,11 @@ static void test_create_ust_event(void)
 
 	ok(event != NULL, "Create UST event");
 
+	if (!event) {
+		skip(1, "UST event is null");
+		return;
+	}
+
 	ok(event->enabled == 0 &&
 	   event->attr.instrumentation == LTTNG_UST_TRACEPOINT &&
 	   strcmp(event->attr.name, ev.name) == 0 &&
@@ -165,12 +181,12 @@ static void test_create_ust_event_exclusion(void)
 	/* set up an exclusion set */
 	exclusion = zmalloc(sizeof(*exclusion) +
 		LTTNG_SYMBOL_NAME_LEN * exclusion_count);
+	ok(exclusion != NULL, "Create UST exclusion");
 	if (!exclusion) {
-		PERROR("zmalloc");
+		skip(4, "zmalloc failed");
+		goto end;
 	}
 
-	ok(exclusion != NULL, "Create UST exclusion");
-
 	exclusion->count = exclusion_count;
 	random_name = get_random_string();
 	strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0), random_name,
@@ -179,13 +195,16 @@ static void test_create_ust_event_exclusion(void)
 		LTTNG_SYMBOL_NAME_LEN);
 
 	event = trace_ust_create_event(&ev, NULL, NULL, exclusion, false);
+	exclusion = NULL;
 
 	ok(!event, "Create UST event with identical exclusion names fails");
 
 	exclusion = zmalloc(sizeof(*exclusion) +
 		LTTNG_SYMBOL_NAME_LEN * exclusion_count);
+	ok(exclusion != NULL, "Create UST exclusion");
 	if (!exclusion) {
-		PERROR("zmalloc");
+		skip(2, "zmalloc failed");
+		goto end;
 	}
 
 	exclusion->count = exclusion_count;
@@ -195,10 +214,13 @@ static void test_create_ust_event_exclusion(void)
 		get_random_string(), LTTNG_SYMBOL_NAME_LEN);
 
 	event = trace_ust_create_event(&ev, NULL, NULL, exclusion, false);
-	assert(event != NULL);
-
 	ok(event != NULL, "Create UST event with different exclusion names");
 
+	if (!event) {
+		skip(1, "UST event with exclusion is null");
+		goto end;
+	}
+
 	ok(event->enabled == 0 &&
 	   event->attr.instrumentation == LTTNG_UST_TRACEPOINT &&
 	   strcmp(event->attr.name, ev.name) == 0 &&
@@ -210,6 +232,8 @@ static void test_create_ust_event_exclusion(void)
 	   "Validate UST event and exclusion");
 
 	trace_ust_destroy_event(event);
+end:
+	return;
 }
 
 
@@ -234,11 +258,15 @@ int main(int argc, char **argv)
 
 	diag("UST data structures unit test");
 
+	rcu_register_thread();
+
 	test_create_one_ust_session();
 	test_create_ust_channel();
 	test_create_ust_event();
 	test_create_ust_context();
 	test_create_ust_event_exclusion();
 
+	rcu_unregister_thread();
+
 	return exit_status();
 }