From 48a93cb665d755e0f92ea648bd72e86dcc3170e5 Mon Sep 17 00:00:00 2001 From: smlng Date: Thu, 12 Jan 2017 17:19:34 +0100 Subject: [PATCH] unittests: fix array length error on OSX --- tests/unittests/tests-base64/tests-base64.c | 9 ++++++--- tests/unittests/tests-fib/tests-fib.c | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/unittests/tests-base64/tests-base64.c b/tests/unittests/tests-base64/tests-base64.c index 3e6c2f1092bc..95c2bf2a7e65 100644 --- a/tests/unittests/tests-base64/tests-base64.c +++ b/tests/unittests/tests-base64/tests-base64.c @@ -303,13 +303,16 @@ static void test_base64_07_stream_decode(void) static void test_base64_08_encode_16_bytes(void) { - const int buffer_size = 16; + /* FIXME: init as enum here and below required, + * to fix folding-constant compiler error on OS X + */ + enum { buffer_size = 16 }; unsigned char buffer[buffer_size]; for (int i = 0; i < buffer_size; ++i) { buffer[i] = 'a'; } - const size_t expected_out_size = 24; + enum { expected_out_size = 24 }; size_t element_base64_out_size = expected_out_size; unsigned char element_base64_out[expected_out_size]; @@ -329,7 +332,7 @@ static void test_base64_08_encode_16_bytes(void) static void test_base64_09_encode_size_determination(void) { - int buffer_size = 20; + enum { buffer_size = 20 }; unsigned char buffer[buffer_size]; for (int i = 0; i < buffer_size; ++i) { buffer[i] = 'a'; diff --git a/tests/unittests/tests-fib/tests-fib.c b/tests/unittests/tests-fib/tests-fib.c index 16b9e4468fd7..86487e8dda20 100644 --- a/tests/unittests/tests-fib/tests-fib.c +++ b/tests/unittests/tests-fib/tests-fib.c @@ -709,7 +709,8 @@ static void test_fib_16_prefix_match(void) */ static void test_fib_17_get_entry_set(void) { - static const size_t addr_buf_size = 16; + /* FIXME: init as enum to fix folding-constant compiler error on OS X */ + enum { addr_buf_size = 16 }; char addr_dst[addr_buf_size]; char addr_nxt[addr_buf_size];