From 9f41525d996519d5d3d4df25453aaa539aadbff8 Mon Sep 17 00:00:00 2001 From: KonstantinKondrashov Date: Mon, 24 Oct 2022 20:35:32 +0800 Subject: [PATCH] esp_timer: Migrate esp_timer unit tests from unit-test-app to component test app --- components/esp_timer/.build-test-rules.yml | 7 ++++ components/esp_timer/test/CMakeLists.txt | 4 --- components/esp_timer/test_apps/CMakeLists.txt | 8 +++++ components/esp_timer/test_apps/README.md | 3 ++ .../esp_timer/test_apps/main/CMakeLists.txt | 4 +++ .../esp_timer/test_apps/main/test_app_main.c | 14 ++++++++ .../{test => test_apps/main}/test_esp_timer.c | 5 +-- .../main}/test_esp_timer_light_sleep.c | 0 .../{test => test_apps/main}/test_ets_timer.c | 5 +-- .../test_apps/pytest_esp_timer_ut.py | 33 +++++++++++++++++++ .../test_apps/sdkconfig.ci.26mhz_esp32c2 | 2 ++ .../sdkconfig.ci.freertos_compliance | 1 + .../esp_timer/test_apps/sdkconfig.ci.general | 0 .../test_apps/sdkconfig.ci.isr_dispatch_esp32 | 2 ++ .../esp_timer/test_apps/sdkconfig.ci.psram | 4 +++ .../esp_timer/test_apps/sdkconfig.ci.release | 3 ++ .../test_apps/sdkconfig.ci.single_core | 1 + .../esp_timer/test_apps/sdkconfig.defaults | 14 ++++++++ .../test_apps/sdkconfig.defaults.esp32 | 1 + .../test_apps/sdkconfig.defaults.esp32c2 | 0 .../test_apps/sdkconfig.defaults.esp32c3 | 0 .../test_apps/sdkconfig.defaults.esp32s2 | 1 + .../test_apps/sdkconfig.defaults.esp32s3 | 1 + tools/unit-test-app/configs/default | 3 +- tools/unit-test-app/configs/default_2 | 2 +- tools/unit-test-app/configs/default_2_c3 | 2 +- tools/unit-test-app/configs/default_2_s2 | 2 +- tools/unit-test-app/configs/default_2_s3 | 2 +- tools/unit-test-app/configs/default_32_2 | 1 - tools/unit-test-app/configs/default_3_c2 | 2 +- tools/unit-test-app/configs/default_c2 | 2 +- tools/unit-test-app/configs/default_c2_26mhz | 5 --- tools/unit-test-app/configs/default_c3 | 2 +- tools/unit-test-app/configs/default_s2_1 | 2 +- tools/unit-test-app/configs/default_s3 | 2 +- .../unit-test-app/configs/freertos_compliance | 2 +- .../configs/freertos_compliance_c2 | 2 +- .../configs/freertos_compliance_c3 | 2 +- .../configs/freertos_compliance_s2 | 2 +- tools/unit-test-app/configs/psram | 3 +- tools/unit-test-app/configs/psram_2 | 2 +- tools/unit-test-app/configs/psram_8m | 2 +- tools/unit-test-app/configs/psram_all_ext_1 | 2 +- tools/unit-test-app/configs/release | 2 +- tools/unit-test-app/configs/release_2 | 2 +- tools/unit-test-app/configs/release_2_s2 | 2 +- tools/unit-test-app/configs/release_c2 | 2 +- tools/unit-test-app/configs/release_c3 | 2 +- tools/unit-test-app/configs/release_s2 | 2 +- tools/unit-test-app/configs/release_s3 | 2 +- tools/unit-test-app/configs/single_core | 2 +- tools/unit-test-app/configs/single_core_2 | 2 +- tools/unit-test-app/configs/single_core_2_s2 | 2 +- tools/unit-test-app/configs/single_core_s2 | 2 +- tools/unit-test-app/sdkconfig.defaults | 1 - 55 files changed, 134 insertions(+), 46 deletions(-) create mode 100644 components/esp_timer/.build-test-rules.yml delete mode 100644 components/esp_timer/test/CMakeLists.txt create mode 100644 components/esp_timer/test_apps/CMakeLists.txt create mode 100644 components/esp_timer/test_apps/README.md create mode 100644 components/esp_timer/test_apps/main/CMakeLists.txt create mode 100644 components/esp_timer/test_apps/main/test_app_main.c rename components/esp_timer/{test => test_apps/main}/test_esp_timer.c (99%) rename components/esp_timer/{test => test_apps/main}/test_esp_timer_light_sleep.c (100%) rename components/esp_timer/{test => test_apps/main}/test_ets_timer.c (98%) create mode 100644 components/esp_timer/test_apps/pytest_esp_timer_ut.py create mode 100644 components/esp_timer/test_apps/sdkconfig.ci.26mhz_esp32c2 create mode 100644 components/esp_timer/test_apps/sdkconfig.ci.freertos_compliance create mode 100644 components/esp_timer/test_apps/sdkconfig.ci.general create mode 100644 components/esp_timer/test_apps/sdkconfig.ci.isr_dispatch_esp32 create mode 100644 components/esp_timer/test_apps/sdkconfig.ci.psram create mode 100644 components/esp_timer/test_apps/sdkconfig.ci.release create mode 100644 components/esp_timer/test_apps/sdkconfig.ci.single_core create mode 100644 components/esp_timer/test_apps/sdkconfig.defaults create mode 100644 components/esp_timer/test_apps/sdkconfig.defaults.esp32 create mode 100644 components/esp_timer/test_apps/sdkconfig.defaults.esp32c2 create mode 100644 components/esp_timer/test_apps/sdkconfig.defaults.esp32c3 create mode 100644 components/esp_timer/test_apps/sdkconfig.defaults.esp32s2 create mode 100644 components/esp_timer/test_apps/sdkconfig.defaults.esp32s3 delete mode 100644 tools/unit-test-app/configs/default_c2_26mhz diff --git a/components/esp_timer/.build-test-rules.yml b/components/esp_timer/.build-test-rules.yml new file mode 100644 index 0000000000..5bc062a221 --- /dev/null +++ b/components/esp_timer/.build-test-rules.yml @@ -0,0 +1,7 @@ +# Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps + +components/esp_timer/test_apps: + disable: + - if: IDF_TARGET in ["esp32c6"] + temporary: true + reason: Not supported yet diff --git a/components/esp_timer/test/CMakeLists.txt b/components/esp_timer/test/CMakeLists.txt deleted file mode 100644 index bf7f6ea740..0000000000 --- a/components/esp_timer/test/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -idf_component_register(SRC_DIRS "." - PRIV_INCLUDE_DIRS "../private_include" - PRIV_REQUIRES cmock test_utils esp_timer spi_flash) -target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format") diff --git a/components/esp_timer/test_apps/CMakeLists.txt b/components/esp_timer/test_apps/CMakeLists.txt new file mode 100644 index 0000000000..094a98cd7c --- /dev/null +++ b/components/esp_timer/test_apps/CMakeLists.txt @@ -0,0 +1,8 @@ +#This is the project CMakeLists.txt file for the test subproject +cmake_minimum_required(VERSION 3.16) + +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") +set(COMPONENTS main) + +include($ENV{IDF_PATH}/tools/cmake/project.cmake) +project(esp_timer_test) diff --git a/components/esp_timer/test_apps/README.md b/components/esp_timer/test_apps/README.md new file mode 100644 index 0000000000..27995c13b2 --- /dev/null +++ b/components/esp_timer/test_apps/README.md @@ -0,0 +1,3 @@ +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | + diff --git a/components/esp_timer/test_apps/main/CMakeLists.txt b/components/esp_timer/test_apps/main/CMakeLists.txt new file mode 100644 index 0000000000..fe611821d5 --- /dev/null +++ b/components/esp_timer/test_apps/main/CMakeLists.txt @@ -0,0 +1,4 @@ +idf_component_register(SRC_DIRS "." + PRIV_INCLUDE_DIRS "../../private_include" + PRIV_REQUIRES cmock test_utils esp_timer spi_flash + WHOLE_ARCHIVE) diff --git a/components/esp_timer/test_apps/main/test_app_main.c b/components/esp_timer/test_apps/main/test_app_main.c new file mode 100644 index 0000000000..a4c1c22289 --- /dev/null +++ b/components/esp_timer/test_apps/main/test_app_main.c @@ -0,0 +1,14 @@ +/* + * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ +#include "unity.h" +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" + +void app_main(void) +{ + vTaskPrioritySet(NULL, CONFIG_UNITY_FREERTOS_PRIORITY); + unity_run_menu(); +} diff --git a/components/esp_timer/test/test_esp_timer.c b/components/esp_timer/test_apps/main/test_esp_timer.c similarity index 99% rename from components/esp_timer/test/test_esp_timer.c rename to components/esp_timer/test_apps/main/test_esp_timer.c index b5fa41e13a..ee3aa7dd85 100644 --- a/components/esp_timer/test/test_esp_timer.c +++ b/components/esp_timer/test_apps/main/test_esp_timer.c @@ -5,6 +5,7 @@ */ #include #include +#include #include #include #include @@ -150,7 +151,7 @@ TEST_CASE("esp_timer produces correct delay", "[esp_timer]") vTaskDelay(delays_ms[i] * 2 / portTICK_PERIOD_MS); TEST_ASSERT(t_end != 0); int32_t ms_diff = (t_end - t_start) / 1000; - printf("%d %d\n", delays_ms[i], ms_diff); + printf("%d %"PRIi32"\n", delays_ms[i], ms_diff); TEST_ASSERT_INT32_WITHIN(portTICK_PERIOD_MS, delays_ms[i], ms_diff); } @@ -177,7 +178,7 @@ static void test_periodic_correct_delays_timer_func(void* arg) test_periodic_correct_delays_args_t* p_args = (test_periodic_correct_delays_args_t*) arg; int64_t t_end = ref_clock_get(); int32_t ms_diff = (t_end - p_args->t_start) / 1000; - printf("timer #%d %dms\n", p_args->cur_interval, ms_diff); + printf("timer #%d %"PRIi32"ms\n", p_args->cur_interval, ms_diff); p_args->intervals[p_args->cur_interval++] = ms_diff; // Deliberately make timer handler run longer. // We check that this doesn't affect the result. diff --git a/components/esp_timer/test/test_esp_timer_light_sleep.c b/components/esp_timer/test_apps/main/test_esp_timer_light_sleep.c similarity index 100% rename from components/esp_timer/test/test_esp_timer_light_sleep.c rename to components/esp_timer/test_apps/main/test_esp_timer_light_sleep.c diff --git a/components/esp_timer/test/test_ets_timer.c b/components/esp_timer/test_apps/main/test_ets_timer.c similarity index 98% rename from components/esp_timer/test/test_ets_timer.c rename to components/esp_timer/test_apps/main/test_ets_timer.c index 15ba842ece..b47d84d799 100644 --- a/components/esp_timer/test/test_ets_timer.c +++ b/components/esp_timer/test_apps/main/test_ets_timer.c @@ -5,6 +5,7 @@ */ #include #include +#include #include #include #include "unity.h" @@ -55,7 +56,7 @@ TEST_CASE("ets_timer produces correct delay", "[ets_timer]") vTaskDelay(delays_ms[i] * 2 / portTICK_PERIOD_MS); int32_t ms_diff = (tv_end.tv_sec - tv_start.tv_sec) * 1000 + (tv_end.tv_usec - tv_start.tv_usec) / 1000; - printf("%d %d\n", delays_ms[i], ms_diff); + printf("%d %"PRIi32"\n", delays_ms[i], ms_diff); TEST_ASSERT_INT32_WITHIN(portTICK_PERIOD_MS, delays_ms[i], ms_diff); } @@ -81,7 +82,7 @@ static void test_periodic_correct_delays_timer_func(void* arg) gettimeofday(&tv_now, NULL); int32_t ms_diff = (tv_now.tv_sec - p_args->tv_start.tv_sec) * 1000 + (tv_now.tv_usec - p_args->tv_start.tv_usec) / 1000; - printf("timer #%d %dms\n", p_args->cur_interval, ms_diff); + printf("timer #%d %"PRIi32"ms\n", p_args->cur_interval, ms_diff); p_args->intervals[p_args->cur_interval++] = ms_diff; // Deliberately make timer handler run longer. // We check that this doesn't affect the result. diff --git a/components/esp_timer/test_apps/pytest_esp_timer_ut.py b/components/esp_timer/test_apps/pytest_esp_timer_ut.py new file mode 100644 index 0000000000..20b5319184 --- /dev/null +++ b/components/esp_timer/test_apps/pytest_esp_timer_ut.py @@ -0,0 +1,33 @@ +# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD +# SPDX-License-Identifier: Unlicense OR CC0-1.0 + +import pytest +from pytest_embedded import Dut + +CONFIGS = [ + pytest.param('general', marks=[pytest.mark.supported_targets]), + pytest.param('release', marks=[pytest.mark.supported_targets]), + pytest.param('single_core', marks=[pytest.mark.esp32]), + pytest.param('freertos_compliance', marks=[pytest.mark.esp32]), + pytest.param('isr_dispatch_esp32', marks=[pytest.mark.esp32]), + pytest.param('26mhz_esp32c2', marks=[pytest.mark.esp32c2]), +] + + +@pytest.mark.generic +@pytest.mark.parametrize('config', CONFIGS, indirect=True) +def test_esp_timer(dut: Dut) -> None: + dut.expect_exact('Press ENTER to see the list of tests') + dut.write('*') + dut.expect_unity_test_output(timeout=240) + + +@pytest.mark.esp32 +@pytest.mark.quad_psram +@pytest.mark.parametrize('config', [ + 'psram', +], indirect=True) +def test_esp_timer_psram(dut: Dut) -> None: + dut.expect_exact('Press ENTER to see the list of tests') + dut.write('*') + dut.expect_unity_test_output(timeout=240) diff --git a/components/esp_timer/test_apps/sdkconfig.ci.26mhz_esp32c2 b/components/esp_timer/test_apps/sdkconfig.ci.26mhz_esp32c2 new file mode 100644 index 0000000000..172f022b67 --- /dev/null +++ b/components/esp_timer/test_apps/sdkconfig.ci.26mhz_esp32c2 @@ -0,0 +1,2 @@ +CONFIG_IDF_TARGET="esp32c2" +CONFIG_XTAL_FREQ_26=y diff --git a/components/esp_timer/test_apps/sdkconfig.ci.freertos_compliance b/components/esp_timer/test_apps/sdkconfig.ci.freertos_compliance new file mode 100644 index 0000000000..c3eaa50fa4 --- /dev/null +++ b/components/esp_timer/test_apps/sdkconfig.ci.freertos_compliance @@ -0,0 +1 @@ +CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE=y diff --git a/components/esp_timer/test_apps/sdkconfig.ci.general b/components/esp_timer/test_apps/sdkconfig.ci.general new file mode 100644 index 0000000000..e69de29bb2 diff --git a/components/esp_timer/test_apps/sdkconfig.ci.isr_dispatch_esp32 b/components/esp_timer/test_apps/sdkconfig.ci.isr_dispatch_esp32 new file mode 100644 index 0000000000..7b30ba49d1 --- /dev/null +++ b/components/esp_timer/test_apps/sdkconfig.ci.isr_dispatch_esp32 @@ -0,0 +1,2 @@ +CONFIG_IDF_TARGET="esp32" +CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD=y diff --git a/components/esp_timer/test_apps/sdkconfig.ci.psram b/components/esp_timer/test_apps/sdkconfig.ci.psram new file mode 100644 index 0000000000..319863e526 --- /dev/null +++ b/components/esp_timer/test_apps/sdkconfig.ci.psram @@ -0,0 +1,4 @@ +CONFIG_SPIRAM=y +CONFIG_ESP_INT_WDT_TIMEOUT_MS=800 +CONFIG_SPIRAM_OCCUPY_NO_HOST=y +CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0 diff --git a/components/esp_timer/test_apps/sdkconfig.ci.release b/components/esp_timer/test_apps/sdkconfig.ci.release new file mode 100644 index 0000000000..3cff15d49e --- /dev/null +++ b/components/esp_timer/test_apps/sdkconfig.ci.release @@ -0,0 +1,3 @@ +CONFIG_COMPILER_OPTIMIZATION_SIZE=y +CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y +CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y diff --git a/components/esp_timer/test_apps/sdkconfig.ci.single_core b/components/esp_timer/test_apps/sdkconfig.ci.single_core new file mode 100644 index 0000000000..f0b0b5e03d --- /dev/null +++ b/components/esp_timer/test_apps/sdkconfig.ci.single_core @@ -0,0 +1 @@ +CONFIG_FREERTOS_UNICORE=y diff --git a/components/esp_timer/test_apps/sdkconfig.defaults b/components/esp_timer/test_apps/sdkconfig.defaults new file mode 100644 index 0000000000..f358ad545f --- /dev/null +++ b/components/esp_timer/test_apps/sdkconfig.defaults @@ -0,0 +1,14 @@ +# General options for additional checks +CONFIG_HEAP_POISONING_COMPREHENSIVE=y +CONFIG_COMPILER_WARN_WRITE_STRINGS=y +CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y +CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y +CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y +CONFIG_COMPILER_STACK_CHECK=y + +CONFIG_ESP_TASK_WDT_INIT=n + +CONFIG_FREERTOS_HZ=1000 +CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192 + +CONFIG_ESP_TIMER_PROFILING=y diff --git a/components/esp_timer/test_apps/sdkconfig.defaults.esp32 b/components/esp_timer/test_apps/sdkconfig.defaults.esp32 new file mode 100644 index 0000000000..7382da578e --- /dev/null +++ b/components/esp_timer/test_apps/sdkconfig.defaults.esp32 @@ -0,0 +1 @@ +CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y diff --git a/components/esp_timer/test_apps/sdkconfig.defaults.esp32c2 b/components/esp_timer/test_apps/sdkconfig.defaults.esp32c2 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/components/esp_timer/test_apps/sdkconfig.defaults.esp32c3 b/components/esp_timer/test_apps/sdkconfig.defaults.esp32c3 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/components/esp_timer/test_apps/sdkconfig.defaults.esp32s2 b/components/esp_timer/test_apps/sdkconfig.defaults.esp32s2 new file mode 100644 index 0000000000..7382da578e --- /dev/null +++ b/components/esp_timer/test_apps/sdkconfig.defaults.esp32s2 @@ -0,0 +1 @@ +CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y diff --git a/components/esp_timer/test_apps/sdkconfig.defaults.esp32s3 b/components/esp_timer/test_apps/sdkconfig.defaults.esp32s3 new file mode 100644 index 0000000000..7382da578e --- /dev/null +++ b/components/esp_timer/test_apps/sdkconfig.defaults.esp32s3 @@ -0,0 +1 @@ +CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y diff --git a/tools/unit-test-app/configs/default b/tools/unit-test-app/configs/default index 6452c346d2..c8397196f0 100644 --- a/tools/unit-test-app/configs/default +++ b/tools/unit-test-app/configs/default @@ -1,5 +1,4 @@ # This config is split between targets since different component needs to be included (esp32, esp32s2) # IRAM is full... split some component to default_32_2 CONFIG_IDF_TARGET="esp32" -TEST_COMPONENTS=esp_hw_support esp_ipc esp_system esp_timer driver -CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD=y +TEST_COMPONENTS=esp_hw_support esp_ipc esp_system driver diff --git a/tools/unit-test-app/configs/default_2 b/tools/unit-test-app/configs/default_2 index 80c4880421..1b52f30e0d 100644 --- a/tools/unit-test-app/configs/default_2 +++ b/tools/unit-test-app/configs/default_2 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be excluded (esp32, esp32s2) CONFIG_IDF_TARGET="esp32" -TEST_EXCLUDE_COMPONENTS=bt esp_hw_support esp_ipc esp_pm esp_system esp_timer driver soc spi_flash vfs test_utils experimental_cpp_component +TEST_EXCLUDE_COMPONENTS=bt esp_hw_support esp_ipc esp_pm esp_system driver soc spi_flash vfs test_utils experimental_cpp_component diff --git a/tools/unit-test-app/configs/default_2_c3 b/tools/unit-test-app/configs/default_2_c3 index 3d9d41cff8..816fe234d4 100644 --- a/tools/unit-test-app/configs/default_2_c3 +++ b/tools/unit-test-app/configs/default_2_c3 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be excluded CONFIG_IDF_TARGET="esp32c3" -TEST_EXCLUDE_COMPONENTS=bt esp_pm esp_hw_support esp_ipc esp_system esp_timer driver soc spi_flash vfs lwip spiffs experimental_cpp_component perfmon test_utils +TEST_EXCLUDE_COMPONENTS=bt esp_pm esp_hw_support esp_ipc esp_system driver soc spi_flash vfs lwip spiffs experimental_cpp_component perfmon test_utils diff --git a/tools/unit-test-app/configs/default_2_s2 b/tools/unit-test-app/configs/default_2_s2 index 8cae45705e..884ba50387 100644 --- a/tools/unit-test-app/configs/default_2_s2 +++ b/tools/unit-test-app/configs/default_2_s2 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be excluded (esp32, esp32s2) CONFIG_IDF_TARGET="esp32s2" -TEST_EXCLUDE_COMPONENTS=bt esp_hw_support esp_ipc esp_pm esp_system esp_timer driver soc spi_flash vfs experimental_cpp_component +TEST_EXCLUDE_COMPONENTS=bt esp_hw_support esp_ipc esp_pm esp_system driver soc spi_flash vfs experimental_cpp_component diff --git a/tools/unit-test-app/configs/default_2_s3 b/tools/unit-test-app/configs/default_2_s3 index 156b131f2f..9b9c864044 100644 --- a/tools/unit-test-app/configs/default_2_s3 +++ b/tools/unit-test-app/configs/default_2_s3 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be excluded (esp32, esp32s2) CONFIG_IDF_TARGET="esp32s3" -TEST_EXCLUDE_COMPONENTS=bt esp32s3 esp_ipc esp_pm esp_system esp_timer driver soc spi_flash vfs experimental_cpp_component test_utils +TEST_EXCLUDE_COMPONENTS=bt esp32s3 esp_ipc esp_pm esp_system driver soc spi_flash vfs experimental_cpp_component test_utils diff --git a/tools/unit-test-app/configs/default_32_2 b/tools/unit-test-app/configs/default_32_2 index 7195921f25..0b3b19ce5c 100644 --- a/tools/unit-test-app/configs/default_32_2 +++ b/tools/unit-test-app/configs/default_32_2 @@ -1,4 +1,3 @@ # continue from default CONFIG_IDF_TARGET="esp32" TEST_COMPONENTS=soc spi_flash vfs -CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD=y diff --git a/tools/unit-test-app/configs/default_3_c2 b/tools/unit-test-app/configs/default_3_c2 index ef2946d119..25f479e775 100644 --- a/tools/unit-test-app/configs/default_3_c2 +++ b/tools/unit-test-app/configs/default_3_c2 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32c2" -TEST_EXCLUDE_COMPONENTS=app_trace esp_common esp_eth esp_hid esp_netif esp_phy esp_ringbuf esp_wifi espcoredump hal lwip mdns mqtt newlib nvs_flash partition_table sdmmc esp_hw_support esp_ipc esp_system esp_timer driver soc spi_flash vfs +TEST_EXCLUDE_COMPONENTS=app_trace esp_common esp_eth esp_hid esp_netif esp_phy esp_ringbuf esp_wifi espcoredump hal lwip mdns mqtt newlib nvs_flash partition_table sdmmc esp_hw_support esp_ipc esp_system driver soc spi_flash vfs diff --git a/tools/unit-test-app/configs/default_c2 b/tools/unit-test-app/configs/default_c2 index 607a538835..952aee7189 100644 --- a/tools/unit-test-app/configs/default_c2 +++ b/tools/unit-test-app/configs/default_c2 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32c2" -TEST_COMPONENTS= esp_hw_support esp_ipc esp_system esp_timer driver soc spi_flash vfs +TEST_COMPONENTS= esp_hw_support esp_ipc esp_system driver soc spi_flash vfs diff --git a/tools/unit-test-app/configs/default_c2_26mhz b/tools/unit-test-app/configs/default_c2_26mhz deleted file mode 100644 index 80cec8360e..0000000000 --- a/tools/unit-test-app/configs/default_c2_26mhz +++ /dev/null @@ -1,5 +0,0 @@ -# This config is split between targets since different component needs to be included -CONFIG_IDF_TARGET="esp32c2" -CONFIG_XTAL_FREQ_26=y - -TEST_COMPONENTS=esp_timer diff --git a/tools/unit-test-app/configs/default_c3 b/tools/unit-test-app/configs/default_c3 index 36322c5b5e..0aaf09979c 100644 --- a/tools/unit-test-app/configs/default_c3 +++ b/tools/unit-test-app/configs/default_c3 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32c3" -TEST_COMPONENTS=esp_hw_support esp_ipc esp_system esp_timer driver +TEST_COMPONENTS=esp_hw_support esp_ipc esp_system driver diff --git a/tools/unit-test-app/configs/default_s2_1 b/tools/unit-test-app/configs/default_s2_1 index cf5ae3fa56..de0e638cd6 100644 --- a/tools/unit-test-app/configs/default_s2_1 +++ b/tools/unit-test-app/configs/default_s2_1 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be included (esp32, esp32s2) CONFIG_IDF_TARGET="esp32s2" -TEST_COMPONENTS=esp_hw_support esp_system esp_timer driver +TEST_COMPONENTS=esp_hw_support esp_system driver diff --git a/tools/unit-test-app/configs/default_s3 b/tools/unit-test-app/configs/default_s3 index b7767ea89c..346473e97b 100644 --- a/tools/unit-test-app/configs/default_s3 +++ b/tools/unit-test-app/configs/default_s3 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32s3" -TEST_COMPONENTS=esp_hw_support esp_ipc esp_system esp_timer driver soc spi_flash vfs +TEST_COMPONENTS=esp_hw_support esp_ipc esp_system driver soc spi_flash vfs diff --git a/tools/unit-test-app/configs/freertos_compliance b/tools/unit-test-app/configs/freertos_compliance index 55d96bf442..a24787da60 100644 --- a/tools/unit-test-app/configs/freertos_compliance +++ b/tools/unit-test-app/configs/freertos_compliance @@ -1,4 +1,4 @@ # This config is split between targets since different component needs to be included (esp32, esp32s2) CONFIG_IDF_TARGET="esp32" -TEST_COMPONENTS=driver esp_hw_support esp_ipc esp_timer spi_flash +TEST_COMPONENTS=driver esp_hw_support esp_ipc spi_flash CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE=y diff --git a/tools/unit-test-app/configs/freertos_compliance_c2 b/tools/unit-test-app/configs/freertos_compliance_c2 index f7db24d8b6..7916012045 100644 --- a/tools/unit-test-app/configs/freertos_compliance_c2 +++ b/tools/unit-test-app/configs/freertos_compliance_c2 @@ -1,4 +1,4 @@ # This config is split between targets since different component needs to be included (esp32, esp32s2) CONFIG_IDF_TARGET="esp32c2" -TEST_COMPONENTS=driver esp_hw_support esp_system esp_timer spi_flash +TEST_COMPONENTS=driver esp_hw_support esp_system spi_flash CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE=y diff --git a/tools/unit-test-app/configs/freertos_compliance_c3 b/tools/unit-test-app/configs/freertos_compliance_c3 index a89936f2de..8fa6fa7d48 100644 --- a/tools/unit-test-app/configs/freertos_compliance_c3 +++ b/tools/unit-test-app/configs/freertos_compliance_c3 @@ -1,4 +1,4 @@ # This config is split between targets since different component needs to be included (esp32, esp32s2) CONFIG_IDF_TARGET="esp32c3" -TEST_COMPONENTS=driver esp_hw_support esp_system esp_timer spi_flash +TEST_COMPONENTS=driver esp_hw_support esp_system spi_flash CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE=y diff --git a/tools/unit-test-app/configs/freertos_compliance_s2 b/tools/unit-test-app/configs/freertos_compliance_s2 index 39836a53b6..022ad1d0b7 100644 --- a/tools/unit-test-app/configs/freertos_compliance_s2 +++ b/tools/unit-test-app/configs/freertos_compliance_s2 @@ -1,4 +1,4 @@ # This config is split between targets since different component needs to be included (esp32, esp32s2) CONFIG_IDF_TARGET="esp32s2" -TEST_COMPONENTS=driver esp_hw_support esp_system esp_timer spi_flash +TEST_COMPONENTS=driver esp_hw_support esp_system spi_flash CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE=y diff --git a/tools/unit-test-app/configs/psram b/tools/unit-test-app/configs/psram index 8870f0b994..1ac47a225e 100644 --- a/tools/unit-test-app/configs/psram +++ b/tools/unit-test-app/configs/psram @@ -1,11 +1,10 @@ CONFIG_IDF_TARGET="esp32" -TEST_EXCLUDE_COMPONENTS=bt driver esp_hw_support esp_ipc esp_pm esp_system esp_timer spi_flash test_utils soc experimental_cpp_component esp-tls sdmmc +TEST_EXCLUDE_COMPONENTS=bt driver esp_hw_support esp_ipc esp_pm esp_system spi_flash test_utils soc experimental_cpp_component esp-tls sdmmc CONFIG_SPIRAM=y CONFIG_ESP_INT_WDT_TIMEOUT_MS=800 CONFIG_SPIRAM_OCCUPY_NO_HOST=y CONFIG_ESP32_WIFI_RX_IRAM_OPT=n CONFIG_ESP32_WIFI_IRAM_OPT=n -CONFIG_ESP_TIMER_PROFILING=n # Disable encrypted flash reads/writes to save IRAM in this build configuration CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY=y diff --git a/tools/unit-test-app/configs/psram_2 b/tools/unit-test-app/configs/psram_2 index c95fbb5015..cd575b036e 100644 --- a/tools/unit-test-app/configs/psram_2 +++ b/tools/unit-test-app/configs/psram_2 @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32" -TEST_COMPONENTS=esp_hw_support esp_ipc esp_system esp_timer spi_flash soc +TEST_COMPONENTS=esp_hw_support esp_ipc esp_system spi_flash soc CONFIG_SPIRAM=y CONFIG_ESP_INT_WDT_TIMEOUT_MS=800 CONFIG_SPIRAM_OCCUPY_NO_HOST=y diff --git a/tools/unit-test-app/configs/psram_8m b/tools/unit-test-app/configs/psram_8m index 1c83eb49df..3001befbb1 100644 --- a/tools/unit-test-app/configs/psram_8m +++ b/tools/unit-test-app/configs/psram_8m @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32" -TEST_COMPONENTS=esp_hw_support esp_timer +TEST_COMPONENTS=esp_hw_support CONFIG_SPIRAM=y CONFIG_SPIRAM_BANKSWITCH_ENABLE=y CONFIG_SPIRAM_BANKSWITCH_RESERVE=8 diff --git a/tools/unit-test-app/configs/psram_all_ext_1 b/tools/unit-test-app/configs/psram_all_ext_1 index 5916921c9e..a3fed000c4 100644 --- a/tools/unit-test-app/configs/psram_all_ext_1 +++ b/tools/unit-test-app/configs/psram_all_ext_1 @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32" -TEST_COMPONENTS=driver esp_hw_support esp_system esp_timer +TEST_COMPONENTS=driver esp_hw_support esp_system CONFIG_SPIRAM=y CONFIG_ESP_INT_WDT_TIMEOUT_MS=800 CONFIG_SPIRAM_OCCUPY_NO_HOST=y diff --git a/tools/unit-test-app/configs/release b/tools/unit-test-app/configs/release index 7f208af2ad..711449913f 100644 --- a/tools/unit-test-app/configs/release +++ b/tools/unit-test-app/configs/release @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32" -TEST_COMPONENTS=esp_hw_support esp_system esp_ipc esp_timer driver soc spi_flash vfs +TEST_COMPONENTS=esp_hw_support esp_system esp_ipc driver soc spi_flash vfs CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y diff --git a/tools/unit-test-app/configs/release_2 b/tools/unit-test-app/configs/release_2 index 8988678b67..0168546bc0 100644 --- a/tools/unit-test-app/configs/release_2 +++ b/tools/unit-test-app/configs/release_2 @@ -1,6 +1,6 @@ # This config is split between targets since different component needs to be included (esp32, esp32s2) CONFIG_IDF_TARGET="esp32" -TEST_EXCLUDE_COMPONENTS=bt esp_hw_support esp_ipc esp_pm esp_system esp_timer driver soc spi_flash vfs test_utils experimental_cpp_component +TEST_EXCLUDE_COMPONENTS=bt esp_hw_support esp_ipc esp_pm esp_system driver soc spi_flash vfs test_utils experimental_cpp_component CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y diff --git a/tools/unit-test-app/configs/release_2_s2 b/tools/unit-test-app/configs/release_2_s2 index fe59e9a7d5..1318c3c7f2 100644 --- a/tools/unit-test-app/configs/release_2_s2 +++ b/tools/unit-test-app/configs/release_2_s2 @@ -1,6 +1,6 @@ # This config is split between targets since different component needs to be excluded (esp32, esp32s2) CONFIG_IDF_TARGET="esp32s2" -TEST_EXCLUDE_COMPONENTS=bt esp_hw_support esp_ipc esp_pm esp_system esp_timer driver soc spi_flash vfs test_utils experimental_cpp_component +TEST_EXCLUDE_COMPONENTS=bt esp_hw_support esp_ipc esp_pm esp_system driver soc spi_flash vfs test_utils experimental_cpp_component CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y diff --git a/tools/unit-test-app/configs/release_c2 b/tools/unit-test-app/configs/release_c2 index dfc01e9428..5d17fae005 100644 --- a/tools/unit-test-app/configs/release_c2 +++ b/tools/unit-test-app/configs/release_c2 @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32c2" -TEST_COMPONENTS=esp_hw_support esp_system esp_ipc esp_timer driver soc spi_flash vfs sdmmc +TEST_COMPONENTS=esp_hw_support esp_system esp_ipc driver soc spi_flash vfs sdmmc CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y diff --git a/tools/unit-test-app/configs/release_c3 b/tools/unit-test-app/configs/release_c3 index 9e438d4f17..02f2966b79 100644 --- a/tools/unit-test-app/configs/release_c3 +++ b/tools/unit-test-app/configs/release_c3 @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32c3" -TEST_COMPONENTS=esp_hw_support esp_ipc esp_system esp_timer driver +TEST_COMPONENTS=esp_hw_support esp_ipc esp_system driver CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y diff --git a/tools/unit-test-app/configs/release_s2 b/tools/unit-test-app/configs/release_s2 index 9014edbae3..c52a30206b 100644 --- a/tools/unit-test-app/configs/release_s2 +++ b/tools/unit-test-app/configs/release_s2 @@ -1,6 +1,6 @@ # This config is split between targets since different component needs to be included (esp32, esp32s2) CONFIG_IDF_TARGET="esp32s2" -TEST_COMPONENTS=esp_hw_support esp_system esp_timer driver soc spi_flash vfs +TEST_COMPONENTS=esp_hw_support esp_system driver soc spi_flash vfs CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y diff --git a/tools/unit-test-app/configs/release_s3 b/tools/unit-test-app/configs/release_s3 index bc0282af27..7e9b09464f 100644 --- a/tools/unit-test-app/configs/release_s3 +++ b/tools/unit-test-app/configs/release_s3 @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32s3" -TEST_COMPONENTS=esp_hw_support esp_system esp_ipc esp_timer driver soc spi_flash vfs +TEST_COMPONENTS=esp_hw_support esp_system esp_ipc driver soc spi_flash vfs CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y diff --git a/tools/unit-test-app/configs/single_core b/tools/unit-test-app/configs/single_core index 1004d7fc5b..49b1c3d18e 100644 --- a/tools/unit-test-app/configs/single_core +++ b/tools/unit-test-app/configs/single_core @@ -1,6 +1,6 @@ # This config is split between targets since different component needs to be included (esp32, esp32s2) CONFIG_IDF_TARGET="esp32" -TEST_COMPONENTS=esp_hw_support esp_system esp_timer driver soc spi_flash vfs +TEST_COMPONENTS=esp_hw_support esp_system driver soc spi_flash vfs CONFIG_FREERTOS_UNICORE=y CONFIG_ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY=y CONFIG_ESP32_RTCDATA_IN_FAST_MEM=y diff --git a/tools/unit-test-app/configs/single_core_2 b/tools/unit-test-app/configs/single_core_2 index 4c7a629241..f4fdf6931b 100644 --- a/tools/unit-test-app/configs/single_core_2 +++ b/tools/unit-test-app/configs/single_core_2 @@ -1,5 +1,5 @@ # This config is split between targets since different component needs to be excluded (esp32, esp32s2) CONFIG_IDF_TARGET="esp32" -TEST_EXCLUDE_COMPONENTS=bt esp_hw_support esp_system esp_pm esp_ipc esp_timer driver soc spi_flash vfs test_utils experimental_cpp_component +TEST_EXCLUDE_COMPONENTS=bt esp_hw_support esp_system esp_pm esp_ipc driver soc spi_flash vfs test_utils experimental_cpp_component CONFIG_FREERTOS_UNICORE=y CONFIG_ESP32_RTCDATA_IN_FAST_MEM=y diff --git a/tools/unit-test-app/configs/single_core_2_s2 b/tools/unit-test-app/configs/single_core_2_s2 index 9908b98c78..5e33f6d3f0 100644 --- a/tools/unit-test-app/configs/single_core_2_s2 +++ b/tools/unit-test-app/configs/single_core_2_s2 @@ -1,5 +1,5 @@ # This config is split between targets since different component needs to be excluded (esp32, esp32s2) CONFIG_IDF_TARGET="esp32s2" -TEST_EXCLUDE_COMPONENTS=bt esp_hw_support esp_ipc esp_system esp_pm esp_timer driver soc spi_flash vfs experimental_cpp_component +TEST_EXCLUDE_COMPONENTS=bt esp_hw_support esp_ipc esp_system esp_pm driver soc spi_flash vfs experimental_cpp_component CONFIG_FREERTOS_UNICORE=y CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM=y diff --git a/tools/unit-test-app/configs/single_core_s2 b/tools/unit-test-app/configs/single_core_s2 index 687e6da57b..2db9f1bbae 100644 --- a/tools/unit-test-app/configs/single_core_s2 +++ b/tools/unit-test-app/configs/single_core_s2 @@ -1,4 +1,4 @@ # This config is split between targets since different component needs to be included (esp32, esp32s2) CONFIG_IDF_TARGET="esp32s2" -TEST_COMPONENTS=esp_hw_support esp_system esp_timer driver soc spi_flash test_utils +TEST_COMPONENTS=esp_hw_support esp_system driver soc spi_flash test_utils CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM=y diff --git a/tools/unit-test-app/sdkconfig.defaults b/tools/unit-test-app/sdkconfig.defaults index 3932be9a46..797dea67e2 100644 --- a/tools/unit-test-app/sdkconfig.defaults +++ b/tools/unit-test-app/sdkconfig.defaults @@ -13,7 +13,6 @@ CONFIG_ESP_TASK_WDT_INIT=n CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS=y CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y CONFIG_COMPILER_STACK_CHECK=y -CONFIG_ESP_TIMER_PROFILING=y CONFIG_ADC_DISABLE_DAC=n CONFIG_COMPILER_WARN_WRITE_STRINGS=y CONFIG_SPI_MASTER_IN_IRAM=y