From 365a7327967822ab86d7eaa9d1168f6abd241671 Mon Sep 17 00:00:00 2001 From: Marius Vikhammer Date: Tue, 30 Jun 2026 16:50:15 +0800 Subject: [PATCH] refactor(esp_timer): move test app into esp_timer_tests subdirectory Make room for additional test apps under test_apps/ by moving the existing esp_timer tests into their own esp_timer_tests/ subdirectory. Update build-test-rules and include paths accordingly. --- components/esp_timer/test_apps/.build-test-rules.yml | 9 ++++++++- .../test_apps/{ => esp_timer_tests}/CMakeLists.txt | 0 .../esp_timer/test_apps/{ => esp_timer_tests}/README.md | 0 .../test_apps/{ => esp_timer_tests}/main/CMakeLists.txt | 2 +- .../test_apps/{ => esp_timer_tests}/main/test_app_main.c | 0 .../{ => esp_timer_tests}/main/test_esp_timer.c | 0 .../{ => esp_timer_tests}/main/test_esp_timer_dfs.c | 0 .../{ => esp_timer_tests}/main/test_esp_timer_etm.c | 0 .../main/test_esp_timer_light_sleep.c | 0 .../{ => esp_timer_tests}/main/test_ets_timer.c | 0 .../{ => esp_timer_tests}/pytest_esp_timer_ut.py | 0 .../{ => esp_timer_tests}/sdkconfig.ci.26mhz_esp32c2 | 0 .../{ => esp_timer_tests}/sdkconfig.ci.any_cpu_esp32 | 0 .../{ => esp_timer_tests}/sdkconfig.ci.any_cpu_esp32s3 | 0 .../{ => esp_timer_tests}/sdkconfig.ci.cpu1_esp32 | 0 .../{ => esp_timer_tests}/sdkconfig.ci.cpu1_esp32s3 | 0 .../test_apps/{ => esp_timer_tests}/sdkconfig.ci.default | 0 .../test_apps/{ => esp_timer_tests}/sdkconfig.ci.dfs | 0 .../sdkconfig.ci.flash_auto_suspend | 0 .../sdkconfig.ci.freertos_compliance | 0 .../test_apps/{ => esp_timer_tests}/sdkconfig.ci.general | 0 .../sdkconfig.ci.isr_dispatch_esp32 | 0 .../sdkconfig.ci.isr_dispatch_esp32c3 | 0 .../test_apps/{ => esp_timer_tests}/sdkconfig.ci.psram | 0 .../test_apps/{ => esp_timer_tests}/sdkconfig.ci.release | 0 .../{ => esp_timer_tests}/sdkconfig.ci.single_core | 0 .../test_apps/{ => esp_timer_tests}/sdkconfig.defaults | 0 .../{ => esp_timer_tests}/sdkconfig.defaults.esp32 | 0 .../{ => esp_timer_tests}/sdkconfig.defaults.esp32c2 | 0 .../{ => esp_timer_tests}/sdkconfig.defaults.esp32c3 | 0 .../{ => esp_timer_tests}/sdkconfig.defaults.esp32s2 | 0 .../{ => esp_timer_tests}/sdkconfig.defaults.esp32s3 | 0 .../{ => esp_timer_tests}/sdkconfig.defaults.linux | 0 .../{ => esp_timer_tests}/sdkconfig.defaults.no_linux | 0 examples/get-started/hello_world/main/hello_world_main.c | 2 +- 35 files changed, 10 insertions(+), 3 deletions(-) rename components/esp_timer/test_apps/{ => esp_timer_tests}/CMakeLists.txt (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/README.md (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/main/CMakeLists.txt (91%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/main/test_app_main.c (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/main/test_esp_timer.c (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/main/test_esp_timer_dfs.c (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/main/test_esp_timer_etm.c (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/main/test_esp_timer_light_sleep.c (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/main/test_ets_timer.c (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/pytest_esp_timer_ut.py (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.ci.26mhz_esp32c2 (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.ci.any_cpu_esp32 (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.ci.any_cpu_esp32s3 (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.ci.cpu1_esp32 (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.ci.cpu1_esp32s3 (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.ci.default (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.ci.dfs (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.ci.flash_auto_suspend (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.ci.freertos_compliance (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.ci.general (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.ci.isr_dispatch_esp32 (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.ci.isr_dispatch_esp32c3 (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.ci.psram (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.ci.release (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.ci.single_core (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.defaults (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.defaults.esp32 (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.defaults.esp32c2 (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.defaults.esp32c3 (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.defaults.esp32s2 (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.defaults.esp32s3 (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.defaults.linux (100%) rename components/esp_timer/test_apps/{ => esp_timer_tests}/sdkconfig.defaults.no_linux (100%) diff --git a/components/esp_timer/test_apps/.build-test-rules.yml b/components/esp_timer/test_apps/.build-test-rules.yml index 833b701ccc0..96d50cb85e7 100644 --- a/components/esp_timer/test_apps/.build-test-rules.yml +++ b/components/esp_timer/test_apps/.build-test-rules.yml @@ -1,6 +1,6 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps -components/esp_timer/test_apps: +components/esp_timer/test_apps/esp_timer_tests: enable: - if: INCLUDE_DEFAULT == 1 or IDF_TARGET == "linux" reason: run existing default build targets and include Linux @@ -14,3 +14,10 @@ components/esp_timer/test_apps: reason: The test requires the XTAL32K clock to measure the esp_timer timing accuracy - if: CONFIG_NAME == "dfs" and SOC_PM_SUPPORTED != 1 reason: The test requires the PM functionality + +components/esp_timer/test_apps/size_metrics: + enable: + - if: IDF_TARGET in ["esp32", "esp32c6"] + reason: Size metrics tracked on one RISC-V (esp32c6) and one Xtensa (esp32) target + depends_components: + - esp_timer diff --git a/components/esp_timer/test_apps/CMakeLists.txt b/components/esp_timer/test_apps/esp_timer_tests/CMakeLists.txt similarity index 100% rename from components/esp_timer/test_apps/CMakeLists.txt rename to components/esp_timer/test_apps/esp_timer_tests/CMakeLists.txt diff --git a/components/esp_timer/test_apps/README.md b/components/esp_timer/test_apps/esp_timer_tests/README.md similarity index 100% rename from components/esp_timer/test_apps/README.md rename to components/esp_timer/test_apps/esp_timer_tests/README.md diff --git a/components/esp_timer/test_apps/main/CMakeLists.txt b/components/esp_timer/test_apps/esp_timer_tests/main/CMakeLists.txt similarity index 91% rename from components/esp_timer/test_apps/main/CMakeLists.txt rename to components/esp_timer/test_apps/esp_timer_tests/main/CMakeLists.txt index 2d96fdf311d..708981f404e 100644 --- a/components/esp_timer/test_apps/main/CMakeLists.txt +++ b/components/esp_timer/test_apps/esp_timer_tests/main/CMakeLists.txt @@ -27,6 +27,6 @@ else() endif() idf_component_register(SRCS ${srcs} - PRIV_INCLUDE_DIRS "../../private_include" "../include" + PRIV_INCLUDE_DIRS "../../../private_include" "../../include" PRIV_REQUIRES "${priv_requires}" WHOLE_ARCHIVE) diff --git a/components/esp_timer/test_apps/main/test_app_main.c b/components/esp_timer/test_apps/esp_timer_tests/main/test_app_main.c similarity index 100% rename from components/esp_timer/test_apps/main/test_app_main.c rename to components/esp_timer/test_apps/esp_timer_tests/main/test_app_main.c diff --git a/components/esp_timer/test_apps/main/test_esp_timer.c b/components/esp_timer/test_apps/esp_timer_tests/main/test_esp_timer.c similarity index 100% rename from components/esp_timer/test_apps/main/test_esp_timer.c rename to components/esp_timer/test_apps/esp_timer_tests/main/test_esp_timer.c diff --git a/components/esp_timer/test_apps/main/test_esp_timer_dfs.c b/components/esp_timer/test_apps/esp_timer_tests/main/test_esp_timer_dfs.c similarity index 100% rename from components/esp_timer/test_apps/main/test_esp_timer_dfs.c rename to components/esp_timer/test_apps/esp_timer_tests/main/test_esp_timer_dfs.c diff --git a/components/esp_timer/test_apps/main/test_esp_timer_etm.c b/components/esp_timer/test_apps/esp_timer_tests/main/test_esp_timer_etm.c similarity index 100% rename from components/esp_timer/test_apps/main/test_esp_timer_etm.c rename to components/esp_timer/test_apps/esp_timer_tests/main/test_esp_timer_etm.c diff --git a/components/esp_timer/test_apps/main/test_esp_timer_light_sleep.c b/components/esp_timer/test_apps/esp_timer_tests/main/test_esp_timer_light_sleep.c similarity index 100% rename from components/esp_timer/test_apps/main/test_esp_timer_light_sleep.c rename to components/esp_timer/test_apps/esp_timer_tests/main/test_esp_timer_light_sleep.c diff --git a/components/esp_timer/test_apps/main/test_ets_timer.c b/components/esp_timer/test_apps/esp_timer_tests/main/test_ets_timer.c similarity index 100% rename from components/esp_timer/test_apps/main/test_ets_timer.c rename to components/esp_timer/test_apps/esp_timer_tests/main/test_ets_timer.c diff --git a/components/esp_timer/test_apps/pytest_esp_timer_ut.py b/components/esp_timer/test_apps/esp_timer_tests/pytest_esp_timer_ut.py similarity index 100% rename from components/esp_timer/test_apps/pytest_esp_timer_ut.py rename to components/esp_timer/test_apps/esp_timer_tests/pytest_esp_timer_ut.py diff --git a/components/esp_timer/test_apps/sdkconfig.ci.26mhz_esp32c2 b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.26mhz_esp32c2 similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.ci.26mhz_esp32c2 rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.26mhz_esp32c2 diff --git a/components/esp_timer/test_apps/sdkconfig.ci.any_cpu_esp32 b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.any_cpu_esp32 similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.ci.any_cpu_esp32 rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.any_cpu_esp32 diff --git a/components/esp_timer/test_apps/sdkconfig.ci.any_cpu_esp32s3 b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.any_cpu_esp32s3 similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.ci.any_cpu_esp32s3 rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.any_cpu_esp32s3 diff --git a/components/esp_timer/test_apps/sdkconfig.ci.cpu1_esp32 b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.cpu1_esp32 similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.ci.cpu1_esp32 rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.cpu1_esp32 diff --git a/components/esp_timer/test_apps/sdkconfig.ci.cpu1_esp32s3 b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.cpu1_esp32s3 similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.ci.cpu1_esp32s3 rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.cpu1_esp32s3 diff --git a/components/esp_timer/test_apps/sdkconfig.ci.default b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.default similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.ci.default rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.default diff --git a/components/esp_timer/test_apps/sdkconfig.ci.dfs b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.dfs similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.ci.dfs rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.dfs diff --git a/components/esp_timer/test_apps/sdkconfig.ci.flash_auto_suspend b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.flash_auto_suspend similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.ci.flash_auto_suspend rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.flash_auto_suspend diff --git a/components/esp_timer/test_apps/sdkconfig.ci.freertos_compliance b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.freertos_compliance similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.ci.freertos_compliance rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.freertos_compliance diff --git a/components/esp_timer/test_apps/sdkconfig.ci.general b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.general similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.ci.general rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.general diff --git a/components/esp_timer/test_apps/sdkconfig.ci.isr_dispatch_esp32 b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.isr_dispatch_esp32 similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.ci.isr_dispatch_esp32 rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.isr_dispatch_esp32 diff --git a/components/esp_timer/test_apps/sdkconfig.ci.isr_dispatch_esp32c3 b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.isr_dispatch_esp32c3 similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.ci.isr_dispatch_esp32c3 rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.isr_dispatch_esp32c3 diff --git a/components/esp_timer/test_apps/sdkconfig.ci.psram b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.psram similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.ci.psram rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.psram diff --git a/components/esp_timer/test_apps/sdkconfig.ci.release b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.release similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.ci.release rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.release diff --git a/components/esp_timer/test_apps/sdkconfig.ci.single_core b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.single_core similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.ci.single_core rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.ci.single_core diff --git a/components/esp_timer/test_apps/sdkconfig.defaults b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.defaults similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.defaults rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.defaults diff --git a/components/esp_timer/test_apps/sdkconfig.defaults.esp32 b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.defaults.esp32 similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.defaults.esp32 rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.defaults.esp32 diff --git a/components/esp_timer/test_apps/sdkconfig.defaults.esp32c2 b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.defaults.esp32c2 similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.defaults.esp32c2 rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.defaults.esp32c2 diff --git a/components/esp_timer/test_apps/sdkconfig.defaults.esp32c3 b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.defaults.esp32c3 similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.defaults.esp32c3 rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.defaults.esp32c3 diff --git a/components/esp_timer/test_apps/sdkconfig.defaults.esp32s2 b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.defaults.esp32s2 similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.defaults.esp32s2 rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.defaults.esp32s2 diff --git a/components/esp_timer/test_apps/sdkconfig.defaults.esp32s3 b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.defaults.esp32s3 similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.defaults.esp32s3 rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.defaults.esp32s3 diff --git a/components/esp_timer/test_apps/sdkconfig.defaults.linux b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.defaults.linux similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.defaults.linux rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.defaults.linux diff --git a/components/esp_timer/test_apps/sdkconfig.defaults.no_linux b/components/esp_timer/test_apps/esp_timer_tests/sdkconfig.defaults.no_linux similarity index 100% rename from components/esp_timer/test_apps/sdkconfig.defaults.no_linux rename to components/esp_timer/test_apps/esp_timer_tests/sdkconfig.defaults.no_linux diff --git a/examples/get-started/hello_world/main/hello_world_main.c b/examples/get-started/hello_world/main/hello_world_main.c index 7010f3ef61c..f25de955002 100644 --- a/examples/get-started/hello_world/main/hello_world_main.c +++ b/examples/get-started/hello_world/main/hello_world_main.c @@ -17,7 +17,7 @@ void app_main(void) { printf("Hello world!\n"); - /* Print chip information */ + /* Print chip inf ormation */ esp_chip_info_t chip_info; uint32_t flash_size; esp_chip_info(&chip_info);