Test cleanup: wrong indentation style in test_ust_data.c

[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 b80cb5b5402eeb26ca2f67cb301a96d8b4714343..f0acb2f2220cc623ecf8ec49339f59cfd5f5186a 100644 (file)
--- a/tests/unit/test_ust_data.c
+++ b/tests/unit/test_ust_data.c
@@ -184,7 +184,8 @@ static void test_create_ust_event_exclusion(void)
        struct lttng_event ev;
        char *name;
        char *random_name;
-       struct lttng_event_exclusion *exclusion;
+       struct lttng_event_exclusion *exclusion = NULL;
+       struct lttng_event_exclusion *exclusion_copy = NULL;
        const int exclusion_count = 2;
 
        memset(&ev, 0, sizeof(ev));
@@ -227,13 +228,33 @@ static void test_create_ust_event_exclusion(void)
                goto end;
        }
 
+       exclusion_copy = zmalloc(sizeof(*exclusion) +
+               LTTNG_SYMBOL_NAME_LEN * exclusion_count);
+       if (!exclusion_copy) {
+               skip(2, "zmalloc failed");
+               goto end;
+       }
+
+       /*
+        * We are giving ownership of the exclusion struct to the
+        * trace_ust_create_event() function. Make a copy of the exclusion struct
+        * so we can compare it later.
+        */
+
        exclusion->count = exclusion_count;
        strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0),
                get_random_string(), LTTNG_SYMBOL_NAME_LEN);
        strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1),
                get_random_string(), LTTNG_SYMBOL_NAME_LEN);
 
+       exclusion_copy->count = exclusion_count;
+       strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 0),
+               LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0), LTTNG_SYMBOL_NAME_LEN);
+       strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 1),
+               LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1), LTTNG_SYMBOL_NAME_LEN);
+
        ret = trace_ust_create_event(&ev, NULL, NULL, exclusion, false, &event);
+       exclusion = NULL;
        ok(ret == LTTNG_OK, "Create UST event with different exclusion names");
 
        if (!event) {
@@ -242,17 +263,19 @@ static void test_create_ust_event_exclusion(void)
        }
 
        ok(event->enabled == 0 &&
-          event->attr.instrumentation == LTTNG_UST_TRACEPOINT &&
-          strcmp(event->attr.name, ev.name) == 0 &&
-          event->exclusion != NULL &&
-          event->exclusion->count == exclusion_count &&
-          !memcmp(event->exclusion->names, exclusion->names,
-               LTTNG_SYMBOL_NAME_LEN * exclusion_count) &&
-          event->attr.name[LTTNG_UST_SYM_NAME_LEN - 1] == '\0',
-          "Validate UST event and exclusion");
+               event->attr.instrumentation == LTTNG_UST_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',
+               "Validate UST event and exclusion");
 
        trace_ust_destroy_event(event);
 end:
+       free(exclusion);
+       free(exclusion_copy);
        return;
 }