Merge pull request #6333 from smlng/pr/unittests/osx_array_fix

unittests: fix array length error on OSX
RIOT-OS · Jan 18, 2017 · 53ab146 · 53ab146
2 parents 39cdcdd + 48a93cb
commit 53ab146
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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];