diff --git a/components/esp_system/test/CMakeLists.txt b/components/esp_system/test/CMakeLists.txt deleted file mode 100644 index 2f98628ec8..0000000000 --- a/components/esp_system/test/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -set(requires "unity" - "test_utils" - "driver" - "esp_timer" - "nvs_flash") - -set(excludes "test_ipc_isr.c" - "test_ipc_isr.S" - "test_ipc.c") - -if(IDF_TARGET STREQUAL "esp32" OR IDF_TARGET STREQUAL "esp32s3") - # If the target is esp32 or esp32s3, we can compile the IPC - # tests. - set(excludes "") - # Add a required dependency - list(APPEND requires "cmock") -endif() - -idf_component_register(SRC_DIRS . - EXCLUDE_SRCS "${excludes}" - PRIV_INCLUDE_DIRS . - PRIV_REQUIRES "${requires}") -target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format") diff --git a/components/esp_system/test_apps/esp_system_unity_tests/CMakeLists.txt b/components/esp_system/test_apps/esp_system_unity_tests/CMakeLists.txt new file mode 100644 index 0000000000..5b00be7c72 --- /dev/null +++ b/components/esp_system/test_apps/esp_system_unity_tests/CMakeLists.txt @@ -0,0 +1,14 @@ +# The following lines of boilerplate have to be in your project's +# CMakeLists in this exact order for cmake to work correctly +cmake_minimum_required(VERSION 3.16) + +include($ENV{IDF_PATH}/tools/cmake/project.cmake) + +set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers") +list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults") + +# "Trim" the build. Include the minimal set of components, main, and anything it depends on. +set(COMPONENTS main) +set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components") + +project(test_esp_system_unity_tests) diff --git a/components/esp_system/test_apps/esp_system_unity_tests/README.md b/components/esp_system/test_apps/esp_system_unity_tests/README.md new file mode 100644 index 0000000000..a8b7833fa3 --- /dev/null +++ b/components/esp_system/test_apps/esp_system_unity_tests/README.md @@ -0,0 +1,2 @@ +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/esp_system/test_apps/esp_system_unity_tests/main/CMakeLists.txt b/components/esp_system/test_apps/esp_system_unity_tests/main/CMakeLists.txt new file mode 100644 index 0000000000..28be7efb5a --- /dev/null +++ b/components/esp_system/test_apps/esp_system_unity_tests/main/CMakeLists.txt @@ -0,0 +1,22 @@ +set(requires "unity" + "test_utils" + "driver" + "esp_timer" + "nvs_flash") + +set(SRC "test_app_main.c" + "test_backtrace.c" + "test_delay.c" + "test_ipc_isr.c" + "test_ipc_isr.S" + "test_ipc.c" + "test_reset_reason.c" + "test_sleep.c" + "test_stack_check.c" + "test_system_time.c" + "test_task_wdt.c") + +idf_component_register(SRCS ${SRC} + PRIV_INCLUDE_DIRS . + PRIV_REQUIRES "${requires}" + WHOLE_ARCHIVE) diff --git a/components/esp_system/test_apps/esp_system_unity_tests/main/test_app_main.c b/components/esp_system/test_apps/esp_system_unity_tests/main/test_app_main.c new file mode 100644 index 0000000000..d894e9325e --- /dev/null +++ b/components/esp_system/test_apps/esp_system_unity_tests/main/test_app_main.c @@ -0,0 +1,50 @@ +/* + * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "unity.h" +#include "unity_test_runner.h" +#include "esp_heap_caps.h" +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" + +// Some resources are lazy allocated, the threshold is left for that case +#define TEST_MEMORY_LEAK_THRESHOLD (-800) + +static size_t before_free_8bit; +static size_t before_free_32bit; + +static void check_leak(size_t before_free, size_t after_free, const char *type) +{ + ssize_t delta = after_free - before_free; + printf("MALLOC_CAP_%s: Before %u bytes free, After %u bytes free (delta %d)\n", type, before_free, after_free, delta); + TEST_ASSERT_MESSAGE(delta >= TEST_MEMORY_LEAK_THRESHOLD, "memory leak"); +} + +void setUp(void) +{ + before_free_8bit = heap_caps_get_free_size(MALLOC_CAP_8BIT); + before_free_32bit = heap_caps_get_free_size(MALLOC_CAP_32BIT); +} + +void tearDown(void) +{ + /* Wait for idle task to clean up */ + vTaskDelay(10 / portTICK_PERIOD_MS); + + size_t after_free_8bit = heap_caps_get_free_size(MALLOC_CAP_8BIT); + size_t after_free_32bit = heap_caps_get_free_size(MALLOC_CAP_32BIT); + check_leak(before_free_8bit, after_free_8bit, "8BIT"); + check_leak(before_free_32bit, after_free_32bit, "32BIT"); +} + +void app_main(void) +{ + /* Some tests were designed under the assumption that the main task ran at CONFIG_UNITY_FREERTOS_PRIORITY*/ + vTaskPrioritySet(NULL, CONFIG_UNITY_FREERTOS_PRIORITY); + + printf("Running esp_system component tests\n"); + unity_run_menu(); +} diff --git a/components/esp_system/test/test_backtrace.c b/components/esp_system/test_apps/esp_system_unity_tests/main/test_backtrace.c similarity index 75% rename from components/esp_system/test/test_backtrace.c rename to components/esp_system/test_apps/esp_system_unity_tests/main/test_backtrace.c index 034c5201ae..d1309f906e 100644 --- a/components/esp_system/test/test_backtrace.c +++ b/components/esp_system/test_apps/esp_system_unity_tests/main/test_backtrace.c @@ -63,7 +63,7 @@ static void level_one_isr(void *arg) recursive_func(RECUR_DEPTH, SW_ISR_LEVEL_3); //Trigger nested interrupt max recursive depth } -TEST_CASE("Test backtrace from abort", "[reset_reason][reset=abort,SW_CPU_RESET]") +static void do_abort(void) { //Allocate level one and three SW interrupts esp_intr_alloc(ETS_INTERNAL_SW0_INTR_SOURCE, 0, level_one_isr, NULL, NULL); //Level 1 SW intr @@ -72,7 +72,17 @@ TEST_CASE("Test backtrace from abort", "[reset_reason][reset=abort,SW_CPU_RESET] recursive_func(RECUR_DEPTH, SW_ISR_LEVEL_1); //Trigger lvl 1 SW interrupt at max recursive depth } -TEST_CASE("Test backtrace from interrupt watchdog timeout", "[reset_reason][reset=Interrupt wdt timeout on CPU0,SW_CPU_RESET]") +static void check_reset_reason_panic(void) +{ + TEST_ASSERT_EQUAL(ESP_RST_PANIC, esp_reset_reason()); +} + +TEST_CASE_MULTIPLE_STAGES("Test backtrace from abort", "[reset_reason][reset=abort,SW_CPU_RESET]", + do_abort, + check_reset_reason_panic) + + +static void do_wdt_timeout(void) { //Allocate level one and three SW interrupts esp_intr_alloc(ETS_INTERNAL_SW0_INTR_SOURCE, 0, level_one_isr, NULL, NULL); //Level 1 SW intr @@ -81,16 +91,31 @@ TEST_CASE("Test backtrace from interrupt watchdog timeout", "[reset_reason][rese recursive_func(RECUR_DEPTH, SW_ISR_LEVEL_1); //Trigger lvl 1 SW interrupt at max recursive depth } +static void check_reset_reason_int_wdt(void) +{ + TEST_ASSERT_EQUAL(ESP_RST_INT_WDT, esp_reset_reason()); +} + +TEST_CASE_MULTIPLE_STAGES("Test backtrace from interrupt watchdog timeout", "[reset_reason][reset=Interrupt wdt timeout on CPU0,SW_CPU_RESET]", + do_wdt_timeout, + check_reset_reason_int_wdt) + + static void write_char_crash(char c) { esp_rom_uart_putc(c); hal_memset((void *)0x00000001, 0, 1); } -TEST_CASE("Test backtrace with a ROM function", "[reset_reason][reset=StoreProhibited,SW_CPU_RESET]") +static void do_rom_crash(void) { esp_rom_install_channel_putc(1, write_char_crash); esp_rom_printf("foo"); } + +TEST_CASE_MULTIPLE_STAGES("Test backtrace with a ROM function", "[reset_reason][reset=StoreProhibited,SW_CPU_RESET]", + do_rom_crash, + check_reset_reason_panic) + #endif diff --git a/components/esp_system/test/test_delay.c b/components/esp_system/test_apps/esp_system_unity_tests/main/test_delay.c similarity index 95% rename from components/esp_system/test/test_delay.c rename to components/esp_system/test_apps/esp_system_unity_tests/main/test_delay.c index 55ed27f5a2..1ca0f32806 100644 --- a/components/esp_system/test/test_delay.c +++ b/components/esp_system/test_apps/esp_system_unity_tests/main/test_delay.c @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ #include #include #include diff --git a/components/esp_system/test/test_ipc.c b/components/esp_system/test_apps/esp_system_unity_tests/main/test_ipc.c similarity index 100% rename from components/esp_system/test/test_ipc.c rename to components/esp_system/test_apps/esp_system_unity_tests/main/test_ipc.c diff --git a/components/esp_system/test/test_ipc_isr.S b/components/esp_system/test_apps/esp_system_unity_tests/main/test_ipc_isr.S similarity index 94% rename from components/esp_system/test/test_ipc_isr.S rename to components/esp_system/test_apps/esp_system_unity_tests/main/test_ipc_isr.S index 064443f3c1..b19a51c202 100644 --- a/components/esp_system/test/test_ipc_isr.S +++ b/components/esp_system/test_apps/esp_system_unity_tests/main/test_ipc_isr.S @@ -4,6 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ +#include "sdkconfig.h" + +#if !CONFIG_FREERTOS_UNICORE + #include #include #include @@ -59,3 +63,5 @@ esp_test_ipc_isr_asm: rsr.ccount a3 s32i a3, a2, 0 ret + +#endif //!CONFIG_FREERTOS_UNICORE diff --git a/components/esp_system/test/test_ipc_isr.c b/components/esp_system/test_apps/esp_system_unity_tests/main/test_ipc_isr.c similarity index 85% rename from components/esp_system/test/test_ipc_isr.c rename to components/esp_system/test_apps/esp_system_unity_tests/main/test_ipc_isr.c index 0657db03ab..428d65b217 100644 --- a/components/esp_system/test/test_ipc_isr.c +++ b/components/esp_system/test_apps/esp_system_unity_tests/main/test_ipc_isr.c @@ -36,11 +36,20 @@ TEST_CASE("Test ipc_isr blocking IPC function calls get_other_core_id", "[ipc]") TEST_ASSERT_EQUAL_HEX(val, 1); } -TEST_CASE("Test ipc_isr exception in asm func leads to StoreProhibited not to Unhandled debug exception", "[ipc][reset=StoreProhibited,SW_CPU_RESET]") +static void do_esp_ipc_isr_asm_call_blocking(void) { esp_ipc_isr_asm_call_blocking(esp_test_ipc_isr_asm, NULL); } +static void check_reset_reason_panic(void) +{ + TEST_ASSERT_EQUAL(ESP_RST_PANIC, esp_reset_reason()); +} + +TEST_CASE_MULTIPLE_STAGES("Test ipc_isr exception in asm func leads to StoreProhibited not to Unhandled debug exception", "[ipc][reset=StoreProhibited,SW_CPU_RESET]", + do_esp_ipc_isr_asm_call_blocking, + check_reset_reason_panic) + void esp_test_ipc_isr_get_cycle_count_other_cpu(void* arg); TEST_CASE("Test ipc_isr blocking IPC function calls get_cycle_count_other_cpu", "[ipc]") diff --git a/components/esp_system/test/test_reset_reason.c b/components/esp_system/test_apps/esp_system_unity_tests/main/test_reset_reason.c similarity index 99% rename from components/esp_system/test/test_reset_reason.c rename to components/esp_system/test_apps/esp_system_unity_tests/main/test_reset_reason.c index 150097c3a4..7d6bafbefb 100644 --- a/components/esp_system/test/test_reset_reason.c +++ b/components/esp_system/test_apps/esp_system_unity_tests/main/test_reset_reason.c @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ #include "unity.h" #include "esp_system.h" #include "esp_task_wdt.h" diff --git a/components/esp_system/test/test_sleep.c b/components/esp_system/test_apps/esp_system_unity_tests/main/test_sleep.c similarity index 96% rename from components/esp_system/test/test_sleep.c rename to components/esp_system/test_apps/esp_system_unity_tests/main/test_sleep.c index e76443c88b..2452a1b00a 100644 --- a/components/esp_system/test/test_sleep.c +++ b/components/esp_system/test_apps/esp_system_unity_tests/main/test_sleep.c @@ -42,6 +42,12 @@ __attribute__((unused)) static struct timeval tv_start, tv_stop; #if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32C6, ESP32H2) + +static void check_sleep_reset(void) +{ + TEST_ASSERT_EQUAL(ESP_RST_DEEPSLEEP, esp_reset_reason()); +} + #ifndef CONFIG_FREERTOS_UNICORE static void deep_sleep_task(void *arg) { @@ -50,6 +56,8 @@ static void deep_sleep_task(void *arg) static void do_deep_sleep_from_app_cpu(void) { + esp_sleep_enable_timer_wakeup(2000000); + xTaskCreatePinnedToCore(&deep_sleep_task, "ds", 2048, NULL, 5, NULL, 1); #ifdef CONFIG_FREERTOS_SMP @@ -65,26 +73,34 @@ static void do_deep_sleep_from_app_cpu(void) } } -TEST_CASE("enter deep sleep on APP CPU and wake up using timer", "[deepsleep][reset=DEEPSLEEP_RESET]") -{ - esp_sleep_enable_timer_wakeup(2000000); - do_deep_sleep_from_app_cpu(); -} +TEST_CASE_MULTIPLE_STAGES("enter deep sleep on APP CPU and wake up using timer", "[deepsleep][reset=DEEPSLEEP_RESET]", + do_deep_sleep_from_app_cpu, + check_sleep_reset) + #endif -TEST_CASE("wake up from deep sleep using timer", "[deepsleep][reset=DEEPSLEEP_RESET]") +static void do_deep_sleep_timer(void) { esp_sleep_enable_timer_wakeup(2000000); esp_deep_sleep_start(); } -TEST_CASE("light sleep followed by deep sleep", "[deepsleep][reset=DEEPSLEEP_RESET]") +TEST_CASE_MULTIPLE_STAGES("wake up from deep sleep using timer", "[deepsleep][reset=DEEPSLEEP_RESET]", + do_deep_sleep_timer, + check_sleep_reset) + + +static void do_light_sleep_deep_sleep_timer(void) { esp_sleep_enable_timer_wakeup(1000000); esp_light_sleep_start(); esp_deep_sleep_start(); } +TEST_CASE_MULTIPLE_STAGES("light sleep followed by deep sleep", "[deepsleep][reset=DEEPSLEEP_RESET]", + do_light_sleep_deep_sleep_timer, + check_sleep_reset) + TEST_CASE("wake up from light sleep using timer", "[deepsleep]") { esp_sleep_enable_timer_wakeup(2000000); @@ -249,11 +265,6 @@ static void check_sleep_reset_and_sleep(void) esp_deep_sleep_start(); } -static void check_sleep_reset(void) -{ - TEST_ASSERT_EQUAL(ESP_RST_DEEPSLEEP, esp_reset_reason()); -} - TEST_CASE_MULTIPLE_STAGES("enter deep sleep more than once", "[deepsleep][reset=DEEPSLEEP_RESET,DEEPSLEEP_RESET,DEEPSLEEP_RESET]", do_deep_sleep, check_sleep_reset_and_sleep, diff --git a/components/esp_system/test/test_stack_check.c b/components/esp_system/test_apps/esp_system_unity_tests/main/test_stack_check.c similarity index 75% rename from components/esp_system/test/test_stack_check.c rename to components/esp_system/test_apps/esp_system_unity_tests/main/test_stack_check.c index abc36047b9..763f758b39 100644 --- a/components/esp_system/test/test_stack_check.c +++ b/components/esp_system/test_apps/esp_system_unity_tests/main/test_stack_check.c @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ #include "unity.h" #if CONFIG_COMPILER_STACK_CHECK diff --git a/components/esp_system/test/test_system_time.c b/components/esp_system/test_apps/esp_system_unity_tests/main/test_system_time.c similarity index 84% rename from components/esp_system/test/test_system_time.c rename to components/esp_system/test_apps/esp_system_unity_tests/main/test_system_time.c index ed85cc8e56..db05be8fd7 100644 --- a/components/esp_system/test/test_system_time.c +++ b/components/esp_system/test_apps/esp_system_unity_tests/main/test_system_time.c @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ #include #include "unity.h" diff --git a/components/esp_system/test/test_task_wdt.c b/components/esp_system/test_apps/esp_system_unity_tests/main/test_task_wdt.c similarity index 100% rename from components/esp_system/test/test_task_wdt.c rename to components/esp_system/test_apps/esp_system_unity_tests/main/test_task_wdt.c diff --git a/components/esp_system/test_apps/esp_system_unity_tests/pytest_esp_system_unity_tests.py b/components/esp_system/test_apps/esp_system_unity_tests/pytest_esp_system_unity_tests.py new file mode 100644 index 0000000000..1c598ca7da --- /dev/null +++ b/components/esp_system/test_apps/esp_system_unity_tests/pytest_esp_system_unity_tests.py @@ -0,0 +1,18 @@ +# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD +# SPDX-License-Identifier: CC0-1.0 + +import pytest +from pytest_embedded import Dut + + +@pytest.mark.generic +@pytest.mark.parametrize( + 'config', + [ + pytest.param('default', marks=[pytest.mark.supported_targets]), + pytest.param('psram', marks=[pytest.mark.esp32, pytest.mark.esp32s2, pytest.mark.esp32s3]), + pytest.param('single_core_esp32', marks=[pytest.mark.esp32]), + ] +) +def test_esp_system(dut: Dut) -> None: + dut.run_all_single_board_cases() diff --git a/components/esp_system/test_apps/esp_system_unity_tests/sdkconfig.ci.default b/components/esp_system/test_apps/esp_system_unity_tests/sdkconfig.ci.default new file mode 100644 index 0000000000..d306fa0e42 --- /dev/null +++ b/components/esp_system/test_apps/esp_system_unity_tests/sdkconfig.ci.default @@ -0,0 +1 @@ +# Default configuration diff --git a/components/esp_system/test_apps/esp_system_unity_tests/sdkconfig.ci.psram b/components/esp_system/test_apps/esp_system_unity_tests/sdkconfig.ci.psram new file mode 100644 index 0000000000..482bcd8baa --- /dev/null +++ b/components/esp_system/test_apps/esp_system_unity_tests/sdkconfig.ci.psram @@ -0,0 +1,2 @@ +CONFIG_SPIRAM=y +CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y diff --git a/components/esp_system/test_apps/esp_system_unity_tests/sdkconfig.ci.single_core_esp32 b/components/esp_system/test_apps/esp_system_unity_tests/sdkconfig.ci.single_core_esp32 new file mode 100644 index 0000000000..0cdd17c2e7 --- /dev/null +++ b/components/esp_system/test_apps/esp_system_unity_tests/sdkconfig.ci.single_core_esp32 @@ -0,0 +1,3 @@ +# Test configuration for using esp-system with under single core on a multicore target. Only tested on the ESP32 +CONFIG_IDF_TARGET="esp32" +CONFIG_FREERTOS_UNICORE=y diff --git a/components/esp_system/test_apps/esp_system_unity_tests/sdkconfig.defaults b/components/esp_system/test_apps/esp_system_unity_tests/sdkconfig.defaults new file mode 100644 index 0000000000..55604ff94b --- /dev/null +++ b/components/esp_system/test_apps/esp_system_unity_tests/sdkconfig.defaults @@ -0,0 +1,6 @@ +# This "default" configuration is appended to all other configurations +# The contents of "sdkconfig.debug_helpers" is also appended to all other configurations (see CMakeLists.txt) +CONFIG_ESP_TASK_WDT_INIT=n +# esp_sleep_enable_gpio_switch() has the change to break UART RX during light sleep stress tests +# Remove this when IDF-4897 is fixed +CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=n diff --git a/tools/unit-test-app/configs/default b/tools/unit-test-app/configs/default index 02cfcdb9c4..3bba707074 100644 --- a/tools/unit-test-app/configs/default +++ b/tools/unit-test-app/configs/default @@ -1,4 +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_system driver +TEST_COMPONENTS=driver diff --git a/tools/unit-test-app/configs/default_2 b/tools/unit-test-app/configs/default_2 index 548e6d5a47..cf9a9f6ba7 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_system driver soc spi_flash vfs test_utils +TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash vfs test_utils diff --git a/tools/unit-test-app/configs/default_2_c3 b/tools/unit-test-app/configs/default_2_c3 index dc2a555504..b616c20afc 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_system driver soc spi_flash vfs lwip spiffs perfmon test_utils +TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash vfs lwip spiffs perfmon test_utils diff --git a/tools/unit-test-app/configs/default_2_s2 b/tools/unit-test-app/configs/default_2_s2 index 3df8ab2324..1e97a22606 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_system driver soc spi_flash vfs +TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash vfs diff --git a/tools/unit-test-app/configs/default_2_s3 b/tools/unit-test-app/configs/default_2_s3 index 34ffcda355..fe9151ec06 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_system driver soc spi_flash vfs test_utils +TEST_EXCLUDE_COMPONENTS=bt esp32s3 driver soc spi_flash vfs test_utils diff --git a/tools/unit-test-app/configs/default_3_c2 b/tools/unit-test-app/configs/default_3_c2 index fa0e213fef..ca88bd6f87 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_eth esp_hid esp_netif esp_phy esp_ringbuf esp_wifi espcoredump hal lwip mdns mqtt newlib nvs_flash partition_table sdmmc esp_system driver soc spi_flash vfs +TEST_EXCLUDE_COMPONENTS=app_trace esp_eth esp_hid esp_netif esp_phy esp_ringbuf esp_wifi espcoredump hal lwip mdns mqtt newlib nvs_flash partition_table sdmmc driver soc spi_flash vfs diff --git a/tools/unit-test-app/configs/default_3_c6 b/tools/unit-test-app/configs/default_3_c6 index 5f7dfe2b78..2bf8fc3d78 100644 --- a/tools/unit-test-app/configs/default_3_c6 +++ b/tools/unit-test-app/configs/default_3_c6 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32c6" -TEST_EXCLUDE_COMPONENTS=app_trace esp_eth esp_hid esp_netif esp_phy esp_ringbuf esp_wifi espcoredump hal lwip mdns mqtt newlib nvs_flash partition_table sdmmc esp_system driver soc spi_flash vfs +TEST_EXCLUDE_COMPONENTS=app_trace esp_eth esp_hid esp_netif esp_phy esp_ringbuf esp_wifi espcoredump hal lwip mdns mqtt newlib nvs_flash partition_table sdmmc driver soc spi_flash vfs diff --git a/tools/unit-test-app/configs/default_3_h2 b/tools/unit-test-app/configs/default_3_h2 index 3cfdc38392..6e140c89ef 100644 --- a/tools/unit-test-app/configs/default_3_h2 +++ b/tools/unit-test-app/configs/default_3_h2 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32h2" -TEST_EXCLUDE_COMPONENTS=app_trace esp_eth esp_hid esp_netif esp_phy esp_ringbuf esp_wifi espcoredump hal lwip mdns mqtt newlib nvs_flash partition_table sdmmc esp_system driver soc spi_flash vfs +TEST_EXCLUDE_COMPONENTS=app_trace esp_eth esp_hid esp_netif esp_phy esp_ringbuf esp_wifi espcoredump hal lwip mdns mqtt newlib nvs_flash partition_table sdmmc driver soc spi_flash vfs diff --git a/tools/unit-test-app/configs/default_c2 b/tools/unit-test-app/configs/default_c2 index 8c31c17705..65ec0430fb 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_system driver soc spi_flash vfs +TEST_COMPONENTS= driver soc spi_flash vfs diff --git a/tools/unit-test-app/configs/default_c3 b/tools/unit-test-app/configs/default_c3 index ee79fa1e4a..4282f8e918 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_system driver +TEST_COMPONENTS=driver diff --git a/tools/unit-test-app/configs/default_c6 b/tools/unit-test-app/configs/default_c6 index ee942b3050..3bdf5fbbf3 100644 --- a/tools/unit-test-app/configs/default_c6 +++ b/tools/unit-test-app/configs/default_c6 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32c6" -TEST_COMPONENTS=esp_system driver soc spi_flash vfs +TEST_COMPONENTS=driver soc spi_flash vfs diff --git a/tools/unit-test-app/configs/default_h2 b/tools/unit-test-app/configs/default_h2 index a7b6a1629a..26073d0cb0 100644 --- a/tools/unit-test-app/configs/default_h2 +++ b/tools/unit-test-app/configs/default_h2 @@ -1,3 +1,3 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32h2" -TEST_COMPONENTS=esp_system driver soc spi_flash vfs +TEST_COMPONENTS=driver soc spi_flash vfs diff --git a/tools/unit-test-app/configs/default_s2_1 b/tools/unit-test-app/configs/default_s2_1 index 4ef8dd3cbc..45f1b263cb 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_system driver +TEST_COMPONENTS=driver diff --git a/tools/unit-test-app/configs/default_s3 b/tools/unit-test-app/configs/default_s3 index f4b4181757..69bf2a4df9 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_system driver soc spi_flash vfs +TEST_COMPONENTS=driver soc spi_flash vfs diff --git a/tools/unit-test-app/configs/freertos_compliance_c2 b/tools/unit-test-app/configs/freertos_compliance_c2 index 09147fbd17..ae65bef6df 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_system spi_flash +TEST_COMPONENTS=driver 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 106ec0fab0..2b4fa9a1b8 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_system spi_flash +TEST_COMPONENTS=driver spi_flash CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE=y diff --git a/tools/unit-test-app/configs/freertos_compliance_c6 b/tools/unit-test-app/configs/freertos_compliance_c6 index e77b081404..9f6f7f7c20 100644 --- a/tools/unit-test-app/configs/freertos_compliance_c6 +++ b/tools/unit-test-app/configs/freertos_compliance_c6 @@ -1,4 +1,4 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32c6" -TEST_COMPONENTS=driver esp_hw_support esp_system spi_flash +TEST_COMPONENTS=driver esp_hw_support spi_flash CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE=y diff --git a/tools/unit-test-app/configs/freertos_compliance_h2 b/tools/unit-test-app/configs/freertos_compliance_h2 index 83002987c0..0bdabbe577 100644 --- a/tools/unit-test-app/configs/freertos_compliance_h2 +++ b/tools/unit-test-app/configs/freertos_compliance_h2 @@ -1,4 +1,4 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32h2" -TEST_COMPONENTS=driver esp_hw_support esp_system spi_flash +TEST_COMPONENTS=driver esp_hw_support 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 5d31b3648d..0d70575fbe 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_system spi_flash +TEST_COMPONENTS=driver 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 eeede926f6..94a49062d2 100644 --- a/tools/unit-test-app/configs/psram +++ b/tools/unit-test-app/configs/psram @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32" -TEST_EXCLUDE_COMPONENTS=bt driver esp_system spi_flash test_utils soc esp-tls sdmmc +TEST_EXCLUDE_COMPONENTS=bt driver spi_flash test_utils soc esp-tls sdmmc 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_2 b/tools/unit-test-app/configs/psram_2 index 249c529b30..8efbdf48a0 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_system spi_flash soc +TEST_COMPONENTS=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_all_ext_1 b/tools/unit-test-app/configs/psram_all_ext_1 index 25818a1543..c560809888 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_system +TEST_COMPONENTS=driver 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_s2_base b/tools/unit-test-app/configs/psram_s2_base deleted file mode 100644 index 251498bf57..0000000000 --- a/tools/unit-test-app/configs/psram_s2_base +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_IDF_TARGET="esp32s2" -TEST_COMPONENTS=esp_system -CONFIG_SPIRAM=y diff --git a/tools/unit-test-app/configs/psram_s3_base b/tools/unit-test-app/configs/psram_s3_base deleted file mode 100644 index 05f38b96dc..0000000000 --- a/tools/unit-test-app/configs/psram_s3_base +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_IDF_TARGET="esp32s3" -TEST_COMPONENTS=esp_system -CONFIG_SPIRAM=y diff --git a/tools/unit-test-app/configs/release b/tools/unit-test-app/configs/release index 52c7be32aa..0236c008d3 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_system driver soc spi_flash vfs +TEST_COMPONENTS=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 bb792f4e69..ef45279257 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_system driver soc spi_flash vfs test_utils +TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash vfs test_utils 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 f9a9870c2c..e6e36db140 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_system driver soc spi_flash vfs test_utils +TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash vfs test_utils 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 976d223ef9..e0922906e8 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_system driver soc spi_flash vfs sdmmc +TEST_COMPONENTS=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 ec65721ad4..72a4cf4371 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_system driver +TEST_COMPONENTS=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_c6 b/tools/unit-test-app/configs/release_c6 index b04e54176f..cc78543934 100644 --- a/tools/unit-test-app/configs/release_c6 +++ b/tools/unit-test-app/configs/release_c6 @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32c6" -TEST_COMPONENTS=esp_hw_support esp_system esp_ipc driver soc spi_flash vfs sdmmc +TEST_COMPONENTS=esp_hw_support 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_h2 b/tools/unit-test-app/configs/release_h2 index f101947cea..ecee90a6de 100644 --- a/tools/unit-test-app/configs/release_h2 +++ b/tools/unit-test-app/configs/release_h2 @@ -1,5 +1,5 @@ CONFIG_IDF_TARGET="esp32h2" -TEST_COMPONENTS=esp_hw_support esp_system esp_ipc driver soc spi_flash vfs sdmmc +TEST_COMPONENTS=esp_hw_support 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_s2 b/tools/unit-test-app/configs/release_s2 index 5daf84c4e7..e5d527738e 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_system driver soc spi_flash vfs +TEST_COMPONENTS=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 5ea7a6b1fc..d218564d6b 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_system driver soc spi_flash vfs +TEST_COMPONENTS=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 70e2c4e849..3c8763f686 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_system driver soc spi_flash vfs +TEST_COMPONENTS=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 f93af667cd..84758221a6 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_system driver soc spi_flash vfs test_utils +TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash vfs test_utils 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 1ea4d72d76..d1206c577f 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_system driver soc spi_flash vfs +TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash vfs 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 576440506e..2b04136a0a 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_system driver soc spi_flash test_utils +TEST_COMPONENTS=driver soc spi_flash test_utils CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM=y