cmocka: add stdint.h includes

jajanusz · lgirdwood · commit f9494d9ce545 · 2019-03-20T11:37:04.000Z
As written in cmocka documentation,
these headers have to be included before cmocka.h:

Signed-off-by: Janusz Jankowski &lt;janusz.jankowski@linux.intel.com&gt;
diff --git a/test/cmocka/CMakeLists.txt b/test/cmocka/CMakeLists.txt
@@ -67,6 +67,10 @@ function(cmocka_test test_name)
 	target_link_libraries(${test_name} PRIVATE cmocka)
 	target_link_libraries(${test_name} PRIVATE sof_options)
 	target_compile_definitions(${test_name} PRIVATE -DCHECK)
+
+	# Cmocka requires this define for stdint.h that defines uintptr
+	target_compile_definitions(${test_name} PRIVATE -D_UINTPTR_T_DEFINED)
+
 	add_test(NAME ${test_name} COMMAND xt-run --exit_with_target_code ${test_name})
 endfunction()
 
diff --git a/test/cmocka/src/audio/buffer/buffer_copy.c b/test/cmocka/src/audio/buffer/buffer_copy.c
@@ -37,6 +37,7 @@
 #include <stddef.h>
 #include <setjmp.h>
 #include <math.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 static void test_audio_buffer_copy_underrun(void **state)
diff --git a/test/cmocka/src/audio/buffer/buffer_new.c b/test/cmocka/src/audio/buffer/buffer_new.c
@@ -37,6 +37,7 @@
 #include <stddef.h>
 #include <setjmp.h>
 #include <math.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 static void test_audio_buffer_new(void **state)
diff --git a/test/cmocka/src/audio/buffer/buffer_wrap.c b/test/cmocka/src/audio/buffer/buffer_wrap.c
@@ -37,6 +37,7 @@
 #include <stddef.h>
 #include <setjmp.h>
 #include <math.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 static void test_audio_buffer_write_fill_10_bytes_and_write_5(void **state)
diff --git a/test/cmocka/src/audio/buffer/buffer_write.c b/test/cmocka/src/audio/buffer/buffer_write.c
@@ -37,6 +37,7 @@
 #include <stddef.h>
 #include <setjmp.h>
 #include <math.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 static void test_audio_buffer_write_10_bytes_out_of_256_and_read_back
diff --git a/test/cmocka/src/audio/component/comp_set_state.c b/test/cmocka/src/audio/component/comp_set_state.c
@@ -34,6 +34,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 #include <sof/sof.h>
 
diff --git a/test/cmocka/src/audio/kpb/kpb_buffer.c b/test/cmocka/src/audio/kpb/kpb_buffer.c
@@ -33,8 +33,8 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
-#include <cmocka.h>
 #include <stdint.h>
+#include <cmocka.h>
 #include <stddef.h>
 
 #include <sof/sof.h>
diff --git a/test/cmocka/src/audio/kpb/kpb_mock.c b/test/cmocka/src/audio/kpb/kpb_mock.c
@@ -1,6 +1,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 #include <sof/alloc.h>
diff --git a/test/cmocka/src/audio/mixer/mixer_test.c b/test/cmocka/src/audio/mixer/mixer_test.c
@@ -32,6 +32,7 @@
 #include <stddef.h>
 #include <math.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 #include <sof/list.h>
diff --git a/test/cmocka/src/audio/mixer/mock.c b/test/cmocka/src/audio/mixer/mock.c
@@ -31,6 +31,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 #include <sof/alloc.h>
diff --git a/test/cmocka/src/audio/selector/selector_test.c b/test/cmocka/src/audio/selector/selector_test.c
@@ -31,6 +31,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 #include <sof/audio/component.h>
 #include "selector.h"
diff --git a/test/cmocka/src/audio/volume/volume_process.c b/test/cmocka/src/audio/volume/volume_process.c
@@ -31,6 +31,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 #include <sof/audio/component.h>
 #include "volume.h"
diff --git a/test/cmocka/src/debugability/macros.c b/test/cmocka/src/debugability/macros.c
@@ -33,6 +33,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 #include <sof/preproc.h>
@@ -70,7 +71,7 @@ static void test_debugability_macros_declare_log_entry(void **state)
 			"(6 << 24)"
 			"1"
 			"1"
-			"53"
+			"54"
 			"sizeof(\"" __FILE__ "\")"
 			"sizeof(\"Message\")"
 			"\"" __FILE__ "\""
diff --git a/test/cmocka/src/lib/lib/rstrcmp.c b/test/cmocka/src/lib/lib/rstrcmp.c
@@ -32,6 +32,7 @@
 
 #include <stdarg.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 static void test_lib_lib_rstrcmp_for_a_and_a_equals_0(void **state)
diff --git a/test/cmocka/src/lib/lib/rstrlen.c b/test/cmocka/src/lib/lib/rstrlen.c
@@ -32,6 +32,7 @@
 
 #include <stdarg.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 static void test_lib_lib_rstrlen_for_empty_str_equals_0(void **state)
diff --git a/test/cmocka/src/lib/lib/strcheck.c b/test/cmocka/src/lib/lib/strcheck.c
@@ -31,6 +31,7 @@
 
 #include <stdarg.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 #include <test_group_generator.h>
diff --git a/test/cmocka/src/lib/preproc/concat.c b/test/cmocka/src/lib/preproc/concat.c
@@ -33,6 +33,7 @@
 #include <sof/alloc.h>
 #include <stdarg.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 #include <sof/preproc.h>
diff --git a/test/cmocka/src/lib/preproc/defer.c b/test/cmocka/src/lib/preproc/defer.c
@@ -33,6 +33,7 @@
 #include <sof/alloc.h>
 #include <stdarg.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 #include <sof/preproc.h>
diff --git a/test/cmocka/src/lib/preproc/get_arg.c b/test/cmocka/src/lib/preproc/get_arg.c
@@ -32,6 +32,7 @@
 
 #include <stdarg.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 #include <sof/preproc.h>
diff --git a/test/cmocka/src/lib/preproc/seq.c b/test/cmocka/src/lib/preproc/seq.c
@@ -32,6 +32,7 @@
 #include <sof/alloc.h>
 #include <stdarg.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 #include <sof/preproc.h>
diff --git a/test/cmocka/src/lib/preproc/varargs_count.c b/test/cmocka/src/lib/preproc/varargs_count.c
@@ -33,6 +33,7 @@
 #include <sof/alloc.h>
 #include <stdarg.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 #include <sof/preproc.h>
diff --git a/test/cmocka/src/list/list_init.c b/test/cmocka/src/list/list_init.c
@@ -33,6 +33,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 static void test_list_list_init_prev_equal_to_root(void **state)
diff --git a/test/cmocka/src/list/list_is_empty.c b/test/cmocka/src/list/list_is_empty.c
@@ -34,6 +34,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 static void test_list_list_is_empty_when_empty_then_true(void **state)
diff --git a/test/cmocka/src/list/list_item.c b/test/cmocka/src/list/list_item.c
@@ -34,6 +34,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 struct test_list_container {
diff --git a/test/cmocka/src/list/list_item_append.c b/test/cmocka/src/list/list_item_append.c
@@ -34,6 +34,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 struct test_data {
diff --git a/test/cmocka/src/list/list_item_del.c b/test/cmocka/src/list/list_item_del.c
@@ -34,6 +34,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 struct test_data {
diff --git a/test/cmocka/src/list/list_item_is_last.c b/test/cmocka/src/list/list_item_is_last.c
@@ -34,6 +34,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 struct test_data {
diff --git a/test/cmocka/src/list/list_item_prepend.c b/test/cmocka/src/list/list_item_prepend.c
@@ -34,6 +34,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 struct test_data {
diff --git a/test/cmocka/src/math/numbers/ceil_divide.c b/test/cmocka/src/math/numbers/ceil_divide.c
@@ -35,6 +35,7 @@
 #include <stddef.h>
 #include <setjmp.h>
 #include <math.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 static void test_math_numbers_ceil_divide(void **state)
diff --git a/test/cmocka/src/math/numbers/find_equal_int16.c b/test/cmocka/src/math/numbers/find_equal_int16.c
@@ -33,6 +33,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 static void test_math_numbers_find_equal_int16_for_5_123_5_10_123_500_123_n_123_equals_1_4_and_6
diff --git a/test/cmocka/src/math/numbers/find_max_abs_int32.c b/test/cmocka/src/math/numbers/find_max_abs_int32.c
@@ -33,6 +33,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 static void test_math_numbers_find_max_abs_int32_for_neg100_99_98_50_equals_100
diff --git a/test/cmocka/src/math/numbers/find_min_int16.c b/test/cmocka/src/math/numbers/find_min_int16.c
@@ -33,6 +33,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 static void test_math_numbers_find_min_int16_for_2_equals_2(void **state)
diff --git a/test/cmocka/src/math/numbers/gcd.c b/test/cmocka/src/math/numbers/gcd.c
@@ -34,6 +34,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 static void test_math_numbers_gcd_for_5083_and_391_equals_391(void **state)
diff --git a/test/cmocka/src/math/numbers/norm_int32.c b/test/cmocka/src/math/numbers/norm_int32.c
@@ -33,6 +33,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
+#include <stdint.h>
 #include <cmocka.h>
 
 static void test_math_numbers_norm_int32_for_0_equals_31(void **state)
