Fix `aarch64` builds

Change-Id: I0636a683b342bd8e2460737260b7e6934d977d7e
Signed-off-by: Michal Bloch <m.bloch@partner.samsung.com>

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2576482..aa27d09 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -38,7 +38,7 @@ SET(CMAKE_LDFLAGS_RELEASE "")
 SET(UNIT_TESTS_CFLAGS "-O0 -D_UNIT_TEST -D_GNU_SOURCE")
 
 SET_TARGET_PROPERTIES(cmocka-core PROPERTIES COMPILE_FLAGS
-       "-I${COMMON_SOURCE_DIR} -I/usr/include/dlog -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include ${UNIT_TESTS_CFLAGS}")
+       "-I${COMMON_SOURCE_DIR} -I/usr/include/dlog ${GLIB2_CFLAGS} ${UNIT_TESTS_CFLAGS}")
 TARGET_LINK_LIBRARIES(cmocka-core resourced_shared_test cmocka dlog gio-2.0 gobject-2.0 glib-2.0
        "-Wl,--wrap=malloc,--wrap=free,--wrap=g_slist_append,--wrap=g_slist_remove,--wrap=strdup,--wrap=strndup -O0")
 

diff --git a/tests/cmocka-core.c b/tests/cmocka-core.c
index 9cc2852..3d3f132 100644 (file)
--- a/tests/cmocka-core.c
+++ b/tests/cmocka-core.c
@@ -219,7 +219,7 @@ static void test_config_parse_new(void **state)
        bool b = false;
        int i = 0;
        float f = 100.0;
-       int bytes = 1;
+       size_t bytes = 1;
        ConfigTableItem items[] = {
                { "section", "key_s", config_parse_string, 0, &str },
                { "section", "key_b", config_parse_bool, 0, &b },