Fix: Lazily initialize max poll set size in poll compat

[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 58f76435e196c5269b0d2abbe5d1be2d30f8f2ba..cf795cfa0759631867ecf1e22872fa420366a0b2 100644 (file)
--- a/tests/unit/test_ust_data.c
+++ b/tests/unit/test_ust_data.c
@@ -38,7 +38,7 @@
 #define RANDOM_STRING_LEN      11
 
 /* Number of TAP tests in this file */
-#define NUM_TESTS 14
+#define NUM_TESTS 16
 
 /* For error.h */
 int lttng_opt_quiet = 1;
@@ -84,6 +84,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 +111,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 +143,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 &&
@@ -156,7 +171,8 @@ static void test_create_ust_event_exclusion(void)
        /* make a wildcarded event name */
        name = get_random_string();
        name[strlen(name) - 1] = '*';
-       strncpy(ev.name, name, LTTNG_SYMBOL_NAME_LEN);
+       ok(lttng_strncpy(ev.name, name, LTTNG_SYMBOL_NAME_LEN) == 0,
+               "Validate string length");
 
        ev.type = LTTNG_EVENT_TRACEPOINT;
        ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
@@ -164,12 +180,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,
@@ -178,13 +194,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;
@@ -194,10 +213,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 &&
@@ -209,6 +231,8 @@ static void test_create_ust_event_exclusion(void)
           "Validate UST event and exclusion");
 
        trace_ust_destroy_event(event);
+end:
+       return;
 }