Tests: abort test on memory allocation failure
authorJérémie Galarneau <jeremie.galarneau@efficios.com>
Wed, 18 May 2016 18:40:51 +0000 (14:40 -0400)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Wed, 18 May 2016 18:40:51 +0000 (14:40 -0400)
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
tests/unit/test_ust_data.c

index 236f507bb0033b8933749d19ee8a4892754ce79a..4d1762f5453086acf5e83e9cc93dcca2cd8bf1e3 100644 (file)
@@ -165,12 +165,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");
+               return;
        }
 
-       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,17 +179,18 @@ 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");
+               return;
        }
 
-       ok(exclusion != NULL, "Create UST exclusion");
-
        exclusion->count = exclusion_count;
        strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0),
                get_random_string(), LTTNG_SYMBOL_NAME_LEN);
This page took 0.03027 seconds and 5 git commands to generate.