From 3111dcc4083da8a62e76a8438dd3c8327c95bd68 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Wed, 18 May 2016 14:40:51 -0400 Subject: [PATCH 1/1] Tests: abort test on memory allocation failure MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- tests/unit/test_ust_data.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c index 236f507bb..4d1762f54 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"); + 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); -- 2.34.1