From df9aa722afe582362b950de70dce2b596524a1d5 Mon Sep 17 00:00:00 2001 From: Darian Leung Date: Sat, 15 Oct 2022 01:37:33 +0800 Subject: [PATCH] freertos: Migrate port tests to test app This commit migrates the "port" tests to the test app as a component. --- components/freertos/test_apps/freertos/CMakeLists.txt | 3 ++- .../freertos/test_apps/freertos/port/CMakeLists.txt | 10 ++++++++++ .../freertos}/port/test_context_save_clobber.S | 0 .../freertos}/port/test_context_save_clobber.c | 0 .../freertos}/port/test_fpu_in_isr.c | 0 .../freertos}/port/test_fpu_in_task.c | 0 .../freertos}/port/test_freertos_hooks.c | 0 .../freertos}/port/test_freertos_isinisrcontext.c | 0 .../freertos}/port/test_newlib_reent.c | 0 .../{test => test_apps/freertos}/port/test_spinlocks.c | 0 .../freertos}/port/test_thread_local.c | 0 .../freertos}/port/test_xtensa_loadstore_handler.c | 0 12 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 components/freertos/test_apps/freertos/port/CMakeLists.txt rename components/freertos/{test => test_apps/freertos}/port/test_context_save_clobber.S (100%) rename components/freertos/{test => test_apps/freertos}/port/test_context_save_clobber.c (100%) rename components/freertos/{test => test_apps/freertos}/port/test_fpu_in_isr.c (100%) rename components/freertos/{test => test_apps/freertos}/port/test_fpu_in_task.c (100%) rename components/freertos/{test => test_apps/freertos}/port/test_freertos_hooks.c (100%) rename components/freertos/{test => test_apps/freertos}/port/test_freertos_isinisrcontext.c (100%) rename components/freertos/{test => test_apps/freertos}/port/test_newlib_reent.c (100%) rename components/freertos/{test => test_apps/freertos}/port/test_spinlocks.c (100%) rename components/freertos/{test => test_apps/freertos}/port/test_thread_local.c (100%) rename components/freertos/{test => test_apps/freertos}/port/test_xtensa_loadstore_handler.c (100%) diff --git a/components/freertos/test_apps/freertos/CMakeLists.txt b/components/freertos/test_apps/freertos/CMakeLists.txt index 64a629abec..e0168c913b 100644 --- a/components/freertos/test_apps/freertos/CMakeLists.txt +++ b/components/freertos/test_apps/freertos/CMakeLists.txt @@ -5,7 +5,8 @@ cmake_minimum_required(VERSION 3.16) # split into different directores in the test app's root directory. Each test # type is treated as separate component set(test_types - "kernel") + "kernel" + "port") list(APPEND EXTRA_COMPONENT_DIRS ${test_types} # Add each test type as a component diff --git a/components/freertos/test_apps/freertos/port/CMakeLists.txt b/components/freertos/test_apps/freertos/port/CMakeLists.txt new file mode 100644 index 0000000000..594e8a8295 --- /dev/null +++ b/components/freertos/test_apps/freertos/port/CMakeLists.txt @@ -0,0 +1,10 @@ +# Register all of the "port" tests as a component + +# In order for the cases defined by `TEST_CASE` in "port" to be linked into +# the final elf, the component can be registered as WHOLE_ARCHIVE +idf_component_register(SRC_DIRS "." + PRIV_REQUIRES test_utils + WHOLE_ARCHIVE) + +# Todo: Fix no-format errors +target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format") diff --git a/components/freertos/test/port/test_context_save_clobber.S b/components/freertos/test_apps/freertos/port/test_context_save_clobber.S similarity index 100% rename from components/freertos/test/port/test_context_save_clobber.S rename to components/freertos/test_apps/freertos/port/test_context_save_clobber.S diff --git a/components/freertos/test/port/test_context_save_clobber.c b/components/freertos/test_apps/freertos/port/test_context_save_clobber.c similarity index 100% rename from components/freertos/test/port/test_context_save_clobber.c rename to components/freertos/test_apps/freertos/port/test_context_save_clobber.c diff --git a/components/freertos/test/port/test_fpu_in_isr.c b/components/freertos/test_apps/freertos/port/test_fpu_in_isr.c similarity index 100% rename from components/freertos/test/port/test_fpu_in_isr.c rename to components/freertos/test_apps/freertos/port/test_fpu_in_isr.c diff --git a/components/freertos/test/port/test_fpu_in_task.c b/components/freertos/test_apps/freertos/port/test_fpu_in_task.c similarity index 100% rename from components/freertos/test/port/test_fpu_in_task.c rename to components/freertos/test_apps/freertos/port/test_fpu_in_task.c diff --git a/components/freertos/test/port/test_freertos_hooks.c b/components/freertos/test_apps/freertos/port/test_freertos_hooks.c similarity index 100% rename from components/freertos/test/port/test_freertos_hooks.c rename to components/freertos/test_apps/freertos/port/test_freertos_hooks.c diff --git a/components/freertos/test/port/test_freertos_isinisrcontext.c b/components/freertos/test_apps/freertos/port/test_freertos_isinisrcontext.c similarity index 100% rename from components/freertos/test/port/test_freertos_isinisrcontext.c rename to components/freertos/test_apps/freertos/port/test_freertos_isinisrcontext.c diff --git a/components/freertos/test/port/test_newlib_reent.c b/components/freertos/test_apps/freertos/port/test_newlib_reent.c similarity index 100% rename from components/freertos/test/port/test_newlib_reent.c rename to components/freertos/test_apps/freertos/port/test_newlib_reent.c diff --git a/components/freertos/test/port/test_spinlocks.c b/components/freertos/test_apps/freertos/port/test_spinlocks.c similarity index 100% rename from components/freertos/test/port/test_spinlocks.c rename to components/freertos/test_apps/freertos/port/test_spinlocks.c diff --git a/components/freertos/test/port/test_thread_local.c b/components/freertos/test_apps/freertos/port/test_thread_local.c similarity index 100% rename from components/freertos/test/port/test_thread_local.c rename to components/freertos/test_apps/freertos/port/test_thread_local.c diff --git a/components/freertos/test/port/test_xtensa_loadstore_handler.c b/components/freertos/test_apps/freertos/port/test_xtensa_loadstore_handler.c similarity index 100% rename from components/freertos/test/port/test_xtensa_loadstore_handler.c rename to components/freertos/test_apps/freertos/port/test_xtensa_loadstore_handler.c