diff --git a/tests/src/lv_test_conf.h b/tests/src/lv_test_conf.h index d47fe63894..2c5ebf6d23 100644 --- a/tests/src/lv_test_conf.h +++ b/tests/src/lv_test_conf.h @@ -20,18 +20,33 @@ extern "C" { * DEFINES *********************/ +#ifdef LVGL_CI_USING_SYS_HEAP +#define LV_STDLIB_INCLUDE +#define LV_MALLOC malloc +#define LV_REALLOC realloc +#define LV_FREE free +#define LV_MEMSET memset +#define LV_MEMCPY memcpy +#endif + +#ifdef LVGL_CI_USING_DEF_HEAP +#define LV_MALLOC lv_malloc_builtin +#define LV_REALLOC lv_realloc_builtin +#define LV_FREE lv_free_builtin +#define LV_MEMSET lv_memset_builtin +#define LV_MEMCPY lv_memcpy_builtin +#endif + + void lv_test_assert_fail(void); #define LV_ASSERT_HANDLER lv_test_assert_fail(); -/********************** - * TYPEDEFS - **********************/ - uint32_t custom_tick_get(void); #define LV_TICK_CUSTOM_SYS_TIME_EXPR custom_tick_get() typedef void * lv_user_data_t; + /********************** * GLOBAL PROTOTYPES **********************/ diff --git a/tests/src/test_cases/test_mem.c b/tests/src/test_cases/test_mem.c index 9f739e54ce..1d40f03cbb 100644 --- a/tests/src/test_cases/test_mem.c +++ b/tests/src/test_cases/test_mem.c @@ -16,7 +16,7 @@ void tearDown(void) /* #3324 */ void test_mem_buf_realloc(void) { -#if LV_USE_BUILTIN_MALLOC +#ifdef LVGL_CI_USING_DEF_HEAP void * buf1 = lv_malloc(20); void * buf2 = lv_realloc(buf1, LV_MEM_SIZE + 16384); TEST_ASSERT_NULL(buf2);