From a1ab2c03ae7471895f8d24f9186c5ac288545e7f Mon Sep 17 00:00:00 2001 From: Yong Bakos Date: Tue, 27 Sep 2016 13:03:50 -0500 Subject: [PATCH] array-test: Include wayland-util.h and simplify init test Include wayland-util.h in addition to wayland-private.h, to be more explicit about where wl_array is defined. Remove the useless repeated testing of wl_array_init, because if it fails once out of thousands of iterations we're all doomed anyway. Signed-off-by: Yong Bakos Reviewed-by: Eric Engestrom [Pekka: add the memset] Signed-off-by: Pekka Paalanen --- tests/array-test.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/tests/array-test.c b/tests/array-test.c index fe589f4..eda610b 100644 --- a/tests/array-test.c +++ b/tests/array-test.c @@ -25,24 +25,22 @@ #include #include +#include +#include "wayland-util.h" #include "wayland-private.h" #include "test-runner.h" TEST(array_init) { - const int iterations = 4122; /* this is arbitrary */ - int i; + struct wl_array array; - /* Init array an arbitray amount of times and verify the - * defaults are sensible. */ + /* fill with garbage to emulate uninitialized memory */ + memset(&array, 0x57, sizeof array); - for (i = 0; i < iterations; i++) { - struct wl_array array; - wl_array_init(&array); - assert(array.size == 0); - assert(array.alloc == 0); - assert(array.data == 0); - } + wl_array_init(&array); + assert(array.size == 0); + assert(array.alloc == 0); + assert(array.data == 0); } TEST(array_release) -- 2.7.4