diff --git a/tools/unit-test-app/configs/default_2_c2 b/tools/unit-test-app/configs/default_2_c2 deleted file mode 100644 index a5f8d178dc8..00000000000 --- a/tools/unit-test-app/configs/default_2_c2 +++ /dev/null @@ -1,7 +0,0 @@ -# This config is split between targets since different component needs to be included -CONFIG_IDF_TARGET="esp32c2" -TEST_COMPONENTS=app_trace esp_eth esp_hid esp_phy esp_wifi espcoredump hal lwip mdns newlib partition_table sdmmc -CONFIG_NEWLIB_TIME_SYSCALL_USE_NONE=n -CONFIG_NEWLIB_TIME_SYSCALL_USE_HRT=y -CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC=n -CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC_HRT=n diff --git a/tools/unit-test-app/configs/default_2_c6 b/tools/unit-test-app/configs/default_2_c6 deleted file mode 100644 index a017534958e..00000000000 --- a/tools/unit-test-app/configs/default_2_c6 +++ /dev/null @@ -1,3 +0,0 @@ -# This config is split between targets since different component needs to be included -CONFIG_IDF_TARGET="esp32c6" -TEST_COMPONENTS=app_trace esp_eth esp_hid esp_phy esp_wifi espcoredump hal lwip mdns newlib partition_table sdmmc diff --git a/tools/unit-test-app/configs/default_2_h2 b/tools/unit-test-app/configs/default_2_h2 deleted file mode 100644 index 1c2d4dd8ffd..00000000000 --- a/tools/unit-test-app/configs/default_2_h2 +++ /dev/null @@ -1,3 +0,0 @@ -# This config is split between targets since different component needs to be included -CONFIG_IDF_TARGET="esp32h2" -TEST_COMPONENTS=app_trace esp_eth esp_hid esp_netif esp_phy esp_wifi espcoredump hal lwip mdns newlib partition_table sdmmc diff --git a/tools/unit-test-app/configs/default_2_s2 b/tools/unit-test-app/configs/default_2_s2 deleted file mode 100644 index c97fa6b736e..00000000000 --- a/tools/unit-test-app/configs/default_2_s2 +++ /dev/null @@ -1,3 +0,0 @@ -# This config is split between targets since different component needs to be excluded (esp32, esp32s2) -CONFIG_IDF_TARGET="esp32s2" -TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash diff --git a/tools/unit-test-app/configs/default_2_s3 b/tools/unit-test-app/configs/default_2_s3 deleted file mode 100644 index 450667deec0..00000000000 --- a/tools/unit-test-app/configs/default_2_s3 +++ /dev/null @@ -1,3 +0,0 @@ -# This config is split between targets since different component needs to be excluded (esp32, esp32s2) -CONFIG_IDF_TARGET="esp32s3" -TEST_EXCLUDE_COMPONENTS=bt esp32s3 driver soc spi_flash test_utils diff --git a/tools/unit-test-app/configs/default_32_2 b/tools/unit-test-app/configs/default_32_2 deleted file mode 100644 index fcd0d474b74..00000000000 --- a/tools/unit-test-app/configs/default_32_2 +++ /dev/null @@ -1,3 +0,0 @@ -# continue from default -CONFIG_IDF_TARGET="esp32" -TEST_COMPONENTS=spi_flash diff --git a/tools/unit-test-app/configs/default_3_c2 b/tools/unit-test-app/configs/default_3_c2 deleted file mode 100644 index 24aff8a7fd4..00000000000 --- a/tools/unit-test-app/configs/default_3_c2 +++ /dev/null @@ -1,3 +0,0 @@ -# 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 newlib partition_table sdmmc driver soc spi_flash diff --git a/tools/unit-test-app/configs/default_3_c3 b/tools/unit-test-app/configs/default_3_c3 deleted file mode 100644 index d052f2b07ea..00000000000 --- a/tools/unit-test-app/configs/default_3_c3 +++ /dev/null @@ -1,3 +0,0 @@ -# This config is split between targets since different component needs to be included -CONFIG_IDF_TARGET="esp32c3" -TEST_COMPONENTS=spi_flash lwip diff --git a/tools/unit-test-app/configs/default_3_c6 b/tools/unit-test-app/configs/default_3_c6 deleted file mode 100644 index 057e5b426f8..00000000000 --- a/tools/unit-test-app/configs/default_3_c6 +++ /dev/null @@ -1,3 +0,0 @@ -# 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 newlib partition_table sdmmc driver soc spi_flash diff --git a/tools/unit-test-app/configs/default_3_h2 b/tools/unit-test-app/configs/default_3_h2 deleted file mode 100644 index c3df75b6680..00000000000 --- a/tools/unit-test-app/configs/default_3_h2 +++ /dev/null @@ -1,3 +0,0 @@ -# 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 newlib partition_table sdmmc driver soc spi_flash diff --git a/tools/unit-test-app/configs/default_c2 b/tools/unit-test-app/configs/default_c2 index 3c6f2832014..ffc843ad053 100644 --- a/tools/unit-test-app/configs/default_c2 +++ b/tools/unit-test-app/configs/default_c2 @@ -1,3 +1,8 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32c2" -TEST_COMPONENTS= soc spi_flash +# spi_flash is tested in other configs +TEST_EXCLUDE_COMPONENTS=spi_flash +CONFIG_NEWLIB_TIME_SYSCALL_USE_NONE=n +CONFIG_NEWLIB_TIME_SYSCALL_USE_HRT=y +CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC=n +CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC_HRT=n diff --git a/tools/unit-test-app/configs/default_2_c3 b/tools/unit-test-app/configs/default_c3 similarity index 59% rename from tools/unit-test-app/configs/default_2_c3 rename to tools/unit-test-app/configs/default_c3 index bb1a39c8694..3e92938608e 100644 --- a/tools/unit-test-app/configs/default_2_c3 +++ b/tools/unit-test-app/configs/default_c3 @@ -1,3 +1,4 @@ # This config is split between targets since different component needs to be excluded CONFIG_IDF_TARGET="esp32c3" -TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash lwip spiffs perfmon test_utils +# spi_flash is tested in other configs +TEST_EXCLUDE_COMPONENTS=spi_flash diff --git a/tools/unit-test-app/configs/default_c6 b/tools/unit-test-app/configs/default_c6 index cd6893058ff..513e8bba41e 100644 --- a/tools/unit-test-app/configs/default_c6 +++ b/tools/unit-test-app/configs/default_c6 @@ -1,3 +1,4 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32c6" -TEST_COMPONENTS=spi_flash +# spi_flash is tested in other configs +TEST_EXCLUDE_COMPONENTS=spi_flash diff --git a/tools/unit-test-app/configs/default_2 b/tools/unit-test-app/configs/default_esp32 similarity index 60% rename from tools/unit-test-app/configs/default_2 rename to tools/unit-test-app/configs/default_esp32 index d20bb2378df..7629c3aa5c1 100644 --- a/tools/unit-test-app/configs/default_2 +++ b/tools/unit-test-app/configs/default_esp32 @@ -1,3 +1,4 @@ # This config is split between targets since different component needs to be excluded (esp32, esp32s2) CONFIG_IDF_TARGET="esp32" -TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash test_utils +# spi_flash are tested in other configs +TEST_EXCLUDE_COMPONENTS=spi_flash test_utils diff --git a/tools/unit-test-app/configs/default_h2 b/tools/unit-test-app/configs/default_h2 index df6d7d32b5f..f67dd8f734a 100644 --- a/tools/unit-test-app/configs/default_h2 +++ b/tools/unit-test-app/configs/default_h2 @@ -1,3 +1,4 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32h2" -TEST_COMPONENTS=spi_flash +# spi_flash is tested in other configs +TEST_EXCLUDE_COMPONENTS=spi_flash diff --git a/tools/unit-test-app/configs/single_core_s2 b/tools/unit-test-app/configs/default_s2 similarity index 57% rename from tools/unit-test-app/configs/single_core_s2 rename to tools/unit-test-app/configs/default_s2 index c76350556ae..0efcd4f38f4 100644 --- a/tools/unit-test-app/configs/single_core_s2 +++ b/tools/unit-test-app/configs/default_s2 @@ -1,4 +1,5 @@ -# This config is split between targets since different component needs to be included (esp32, esp32s2) +# This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32s2" -TEST_COMPONENTS=spi_flash test_utils +# spi_flash is tested in other configs +TEST_EXCLUDE_COMPONENTS=spi_flash CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM=y diff --git a/tools/unit-test-app/configs/default_s2_2 b/tools/unit-test-app/configs/default_s2_2 deleted file mode 100644 index 5da4ddf3c99..00000000000 --- a/tools/unit-test-app/configs/default_s2_2 +++ /dev/null @@ -1,3 +0,0 @@ -# This config is split between targets since different component needs to be included (esp32, esp32s2) -CONFIG_IDF_TARGET="esp32s2" -TEST_COMPONENTS=spi_flash diff --git a/tools/unit-test-app/configs/default_s3 b/tools/unit-test-app/configs/default_s3 index 3a11263a72b..937de92e2c4 100644 --- a/tools/unit-test-app/configs/default_s3 +++ b/tools/unit-test-app/configs/default_s3 @@ -1,3 +1,4 @@ # This config is split between targets since different component needs to be included CONFIG_IDF_TARGET="esp32s3" -TEST_COMPONENTS=spi_flash +# spi_flash is tested in other configs +TEST_EXCLUDE_COMPONENTS=spi_flash test_utils diff --git a/tools/unit-test-app/configs/no_optimization_c6 b/tools/unit-test-app/configs/no_optimization_c6 index fba67510a9d..f00f0a8444f 100644 --- a/tools/unit-test-app/configs/no_optimization_c6 +++ b/tools/unit-test-app/configs/no_optimization_c6 @@ -1,3 +1,3 @@ CONFIG_IDF_TARGET="esp32c6" -TEST_COMPONENTS=esp_ipc spi_flash +TEST_COMPONENTS=spi_flash CONFIG_COMPILER_OPTIMIZATION_NONE=y diff --git a/tools/unit-test-app/configs/no_optimization_h2 b/tools/unit-test-app/configs/no_optimization_h2 index 50546d83047..a705e0cca27 100644 --- a/tools/unit-test-app/configs/no_optimization_h2 +++ b/tools/unit-test-app/configs/no_optimization_h2 @@ -1,3 +1,3 @@ CONFIG_IDF_TARGET="esp32h2" -TEST_COMPONENTS=esp_ipc spi_flash +TEST_COMPONENTS=spi_flash CONFIG_COMPILER_OPTIMIZATION_NONE=y diff --git a/tools/unit-test-app/configs/psram b/tools/unit-test-app/configs/psram index 94a49062d2d..2a519e5b29b 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 spi_flash test_utils soc esp-tls sdmmc +TEST_EXCLUDE_COMPONENTS=bt driver spi_flash test_utils esp-tls 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 8efbdf48a0d..a67acf4451c 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=spi_flash soc +TEST_COMPONENTS=spi_flash 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_3 b/tools/unit-test-app/configs/psram_3 deleted file mode 100644 index 5c13a0fca52..00000000000 --- a/tools/unit-test-app/configs/psram_3 +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_IDF_TARGET="esp32" -TEST_COMPONENTS=sdmmc -CONFIG_SPIRAM=y -CONFIG_ESP_INT_WDT_TIMEOUT_MS=800 -CONFIG_SPIRAM_OCCUPY_NO_HOST=y -CONFIG_ESP_WIFI_RX_IRAM_OPT=n diff --git a/tools/unit-test-app/configs/release b/tools/unit-test-app/configs/release index eac3b841817..05343f4fe56 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=driver soc spi_flash +TEST_EXCLUDE_COMPONENTS=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 b/tools/unit-test-app/configs/release_2 deleted file mode 100644 index a36bef2d8b2..00000000000 --- a/tools/unit-test-app/configs/release_2 +++ /dev/null @@ -1,6 +0,0 @@ -# This config is split between targets since different component needs to be included (esp32, esp32s2) -CONFIG_IDF_TARGET="esp32" -TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash 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 deleted file mode 100644 index 8c84bbbd57d..00000000000 --- a/tools/unit-test-app/configs/release_2_s2 +++ /dev/null @@ -1,6 +0,0 @@ -# This config is split between targets since different component needs to be excluded (esp32, esp32s2) -CONFIG_IDF_TARGET="esp32s2" -TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash 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 cb647f9dce8..9ff7ba8e773 100644 --- a/tools/unit-test-app/configs/release_c2 +++ b/tools/unit-test-app/configs/release_c2 @@ -1,5 +1,9 @@ CONFIG_IDF_TARGET="esp32c2" -TEST_COMPONENTS=spi_flash sdmmc +TEST_EXCLUDE_COMPONENTS=test_utils CONFIG_COMPILER_OPTIMIZATION_SIZE=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y +CONFIG_NEWLIB_TIME_SYSCALL_USE_NONE=n +CONFIG_NEWLIB_TIME_SYSCALL_USE_HRT=y +CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC=n +CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC_HRT=n diff --git a/tools/unit-test-app/configs/release_c3_2 b/tools/unit-test-app/configs/release_c3_2 deleted file mode 100644 index d7ed117c205..00000000000 --- a/tools/unit-test-app/configs/release_c3_2 +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_IDF_TARGET="esp32c3" -TEST_COMPONENTS=spi_flash 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_c6 b/tools/unit-test-app/configs/release_c6 index da883546958..4ddaa42c9c4 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_ipc spi_flash sdmmc +TEST_EXCLUDE_COMPONENTS=test_utils 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 132fb82f952..c7512806bfa 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_ipc spi_flash sdmmc +TEST_EXCLUDE_COMPONENTS=test_utils 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 5d9f72d2548..2c38a071ed0 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=spi_flash +TEST_EXCLUDE_COMPONENTS=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_s3 b/tools/unit-test-app/configs/release_s3 index 846a8c2999c..9632ef66f81 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=spi_flash +TEST_EXCLUDE_COMPONENTS=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/single_core b/tools/unit-test-app/configs/single_core index fd500c98c14..30be19c5e07 100644 --- a/tools/unit-test-app/configs/single_core +++ b/tools/unit-test-app/configs/single_core @@ -1,6 +1,5 @@ -# This config is split between targets since different component needs to be included (esp32, esp32s2) CONFIG_IDF_TARGET="esp32" -TEST_COMPONENTS=spi_flash +TEST_EXCLUDE_COMPONENTS=test_utils 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 deleted file mode 100644 index 66ca7b9c3e5..00000000000 --- a/tools/unit-test-app/configs/single_core_2 +++ /dev/null @@ -1,5 +0,0 @@ -# This config is split between targets since different component needs to be excluded (esp32, esp32s2) -CONFIG_IDF_TARGET="esp32" -TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash 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 deleted file mode 100644 index 34e433363d8..00000000000 --- a/tools/unit-test-app/configs/single_core_2_s2 +++ /dev/null @@ -1,5 +0,0 @@ -# This config is split between targets since different component needs to be excluded (esp32, esp32s2) -CONFIG_IDF_TARGET="esp32s2" -TEST_EXCLUDE_COMPONENTS=bt driver soc spi_flash -CONFIG_FREERTOS_UNICORE=y -CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM=y