X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Funit%2Ftest_ust_data.c;h=82d15b66d21ff6e34e20538c0b4e45723ad0d3d2;hb=84a7eb731975042c535645dd747a51825b302f93;hp=236f507bb0033b8933749d19ee8a4892754ce79a;hpb=1cda50f219bf032d70878467ace8caabc2ef320a;p=lttng-tools.git diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c index 236f507bb..82d15b66d 100644 --- a/tests/unit/test_ust_data.c +++ b/tests/unit/test_ust_data.c @@ -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"); + abort(); } - 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"); + abort(); } - 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);