From be057f26dcb0b23ca06da4cbc6c340ff69a21080 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Thu, 20 Jul 2023 17:58:02 +0200 Subject: [PATCH] ci(system): re-enable build test app for C2 and C6, clean up configs Since we can use CONFIG_NAME now to specify build rules, we don't need to have target-specific config files. --- tools/test_apps/.build-test-rules.yml | 7 ++++++- tools/test_apps/system/build_test/README.md | 6 ++---- .../sdkconfig.ci.esp32c2_without_rom_impl_components | 5 ----- .../sdkconfig.ci.esp32c6_with_rom_impl_components | 5 ----- .../sdkconfig.ci.esp32c6_without_rom_impl_components | 5 ----- .../system/build_test/sdkconfig.ci.esp32c6_without_rvfplib | 2 -- .../sdkconfig.ci.esp32h2_with_rom_impl_components | 5 ----- ...impl_components => sdkconfig.ci.no_rom_impl_components} | 3 ++- ....ci.esp32c2_without_rvfplib => sdkconfig.ci.no_rvfplib} | 0 ...om_impl_components => sdkconfig.ci.rom_impl_components} | 3 ++- .../system/build_test/sdkconfig.ci.usb_console_ets_printf | 1 - .../system/build_test/sdkconfig.ci.usb_serial_jtag | 1 - 12 files changed, 12 insertions(+), 31 deletions(-) delete mode 100644 tools/test_apps/system/build_test/sdkconfig.ci.esp32c2_without_rom_impl_components delete mode 100644 tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_with_rom_impl_components delete mode 100644 tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_without_rom_impl_components delete mode 100644 tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_without_rvfplib delete mode 100644 tools/test_apps/system/build_test/sdkconfig.ci.esp32h2_with_rom_impl_components rename tools/test_apps/system/build_test/{sdkconfig.ci.esp32h2_without_rom_impl_components => sdkconfig.ci.no_rom_impl_components} (60%) rename tools/test_apps/system/build_test/{sdkconfig.ci.esp32c2_without_rvfplib => sdkconfig.ci.no_rvfplib} (100%) rename tools/test_apps/system/build_test/{sdkconfig.ci.esp32c2_with_rom_impl_components => sdkconfig.ci.rom_impl_components} (60%) diff --git a/tools/test_apps/.build-test-rules.yml b/tools/test_apps/.build-test-rules.yml index 2377514f41..55b2a04c5a 100644 --- a/tools/test_apps/.build-test-rules.yml +++ b/tools/test_apps/.build-test-rules.yml @@ -82,7 +82,12 @@ tools/test_apps/system/bootloader_sections: tools/test_apps/system/build_test: disable: - - if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6" + # For ROM impl build tests, disable them if none of the tested features are supported in the ROM + - if: CONFIG_NAME == "rom_impl_components" and ((ESP_ROM_HAS_HAL_WDT != 1 and ESP_ROM_HAS_HAL_SYSTIMER != 1) and (ESP_ROM_HAS_HEAP_TLSF != 1 and ESP_ROM_HAS_SPI_FLASH != 1)) + - if: CONFIG_NAME == "no_rom_impl_components" and ((ESP_ROM_HAS_HAL_WDT != 1 and ESP_ROM_HAS_HAL_SYSTIMER != 1) and (ESP_ROM_HAS_HEAP_TLSF != 1 and ESP_ROM_HAS_SPI_FLASH != 1)) + - if: CONFIG_NAME == "no_rvfplib" and ESP_ROM_HAS_RVFPLIB != 1 + - if: CONFIG_NAME == "usb_serial_jtag" AND SOC_USB_SERIAL_JTAG_SUPPORTED != 1 + - if: CONFIG_NAME == "usb_console_ets_printf" AND SOC_USB_OTG_SUPPORTED != 1 temporary: true reason: target(s) not supported yet diff --git a/tools/test_apps/system/build_test/README.md b/tools/test_apps/system/build_test/README.md index aee192bfcd..ff94877200 100644 --- a/tools/test_apps/system/build_test/README.md +++ b/tools/test_apps/system/build_test/README.md @@ -1,7 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-H2 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | - -Efuse on ESP32-C2 not supported +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | This project is for testing if the application can be built with a particular sdkconfig setting. diff --git a/tools/test_apps/system/build_test/sdkconfig.ci.esp32c2_without_rom_impl_components b/tools/test_apps/system/build_test/sdkconfig.ci.esp32c2_without_rom_impl_components deleted file mode 100644 index e777b39382..0000000000 --- a/tools/test_apps/system/build_test/sdkconfig.ci.esp32c2_without_rom_impl_components +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_IDF_TARGET="esp32c2" -CONFIG_HAL_WDT_USE_ROM_IMPL=n -CONFIG_HAL_SYSTIMER_USE_ROM_IMPL=n -CONFIG_HEAP_TLSF_USE_ROM_IMPL=n -CONFIG_SPI_FLASH_ROM_IMPL=n diff --git a/tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_with_rom_impl_components b/tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_with_rom_impl_components deleted file mode 100644 index cb561f4977..0000000000 --- a/tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_with_rom_impl_components +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_IDF_TARGET="esp32c6" -CONFIG_HAL_WDT_USE_ROM_IMPL=y -CONFIG_HAL_SYSTIMER_USE_ROM_IMPL=y -CONFIG_HEAP_TLSF_USE_ROM_IMPL=y -CONFIG_SPI_FLASH_ROM_IMPL=y diff --git a/tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_without_rom_impl_components b/tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_without_rom_impl_components deleted file mode 100644 index ee55ffa744..0000000000 --- a/tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_without_rom_impl_components +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_IDF_TARGET="esp32c6" -CONFIG_HAL_WDT_USE_ROM_IMPL=n -CONFIG_HAL_SYSTIMER_USE_ROM_IMPL=n -CONFIG_HEAP_TLSF_USE_ROM_IMPL=n -CONFIG_SPI_FLASH_ROM_IMPL=n diff --git a/tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_without_rvfplib b/tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_without_rvfplib deleted file mode 100644 index e82ca0e1f0..0000000000 --- a/tools/test_apps/system/build_test/sdkconfig.ci.esp32c6_without_rvfplib +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_IDF_TARGET="esp32c6" -CONFIG_COMPILER_FLOAT_LIB_FROM_GCCLIB=y diff --git a/tools/test_apps/system/build_test/sdkconfig.ci.esp32h2_with_rom_impl_components b/tools/test_apps/system/build_test/sdkconfig.ci.esp32h2_with_rom_impl_components deleted file mode 100644 index 7456ed4f65..0000000000 --- a/tools/test_apps/system/build_test/sdkconfig.ci.esp32h2_with_rom_impl_components +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_IDF_TARGET="esp32h2" -CONFIG_HAL_WDT_USE_ROM_IMPL=y -CONFIG_HAL_SYSTIMER_USE_ROM_IMPL=y -CONFIG_HEAP_TLSF_USE_ROM_IMPL=y -CONFIG_SPI_FLASH_ROM_IMPL=y diff --git a/tools/test_apps/system/build_test/sdkconfig.ci.esp32h2_without_rom_impl_components b/tools/test_apps/system/build_test/sdkconfig.ci.no_rom_impl_components similarity index 60% rename from tools/test_apps/system/build_test/sdkconfig.ci.esp32h2_without_rom_impl_components rename to tools/test_apps/system/build_test/sdkconfig.ci.no_rom_impl_components index 843ca0e1a1..91e0216ac4 100644 --- a/tools/test_apps/system/build_test/sdkconfig.ci.esp32h2_without_rom_impl_components +++ b/tools/test_apps/system/build_test/sdkconfig.ci.no_rom_impl_components @@ -1,5 +1,6 @@ -CONFIG_IDF_TARGET="esp32h2" CONFIG_HAL_WDT_USE_ROM_IMPL=n CONFIG_HAL_SYSTIMER_USE_ROM_IMPL=n CONFIG_HEAP_TLSF_USE_ROM_IMPL=n CONFIG_SPI_FLASH_ROM_IMPL=n + +# update tools/test_apps/.build-test-rules.yml if adding more ROM options above! diff --git a/tools/test_apps/system/build_test/sdkconfig.ci.esp32c2_without_rvfplib b/tools/test_apps/system/build_test/sdkconfig.ci.no_rvfplib similarity index 100% rename from tools/test_apps/system/build_test/sdkconfig.ci.esp32c2_without_rvfplib rename to tools/test_apps/system/build_test/sdkconfig.ci.no_rvfplib diff --git a/tools/test_apps/system/build_test/sdkconfig.ci.esp32c2_with_rom_impl_components b/tools/test_apps/system/build_test/sdkconfig.ci.rom_impl_components similarity index 60% rename from tools/test_apps/system/build_test/sdkconfig.ci.esp32c2_with_rom_impl_components rename to tools/test_apps/system/build_test/sdkconfig.ci.rom_impl_components index 68e9623a04..3b8ce27617 100644 --- a/tools/test_apps/system/build_test/sdkconfig.ci.esp32c2_with_rom_impl_components +++ b/tools/test_apps/system/build_test/sdkconfig.ci.rom_impl_components @@ -1,5 +1,6 @@ -CONFIG_IDF_TARGET="esp32c2" CONFIG_HAL_WDT_USE_ROM_IMPL=y CONFIG_HAL_SYSTIMER_USE_ROM_IMPL=y CONFIG_HEAP_TLSF_USE_ROM_IMPL=y CONFIG_SPI_FLASH_ROM_IMPL=y + +# update tools/test_apps/.build-test-rules.yml if adding more ROM options above! diff --git a/tools/test_apps/system/build_test/sdkconfig.ci.usb_console_ets_printf b/tools/test_apps/system/build_test/sdkconfig.ci.usb_console_ets_printf index 52aabffb98..fac982eb0e 100644 --- a/tools/test_apps/system/build_test/sdkconfig.ci.usb_console_ets_printf +++ b/tools/test_apps/system/build_test/sdkconfig.ci.usb_console_ets_printf @@ -1,3 +1,2 @@ -CONFIG_IDF_TARGET="esp32s3" CONFIG_ESP_CONSOLE_USB_CDC=y CONFIG_ESP_CONSOLE_USB_CDC_SUPPORT_ETS_PRINTF=y diff --git a/tools/test_apps/system/build_test/sdkconfig.ci.usb_serial_jtag b/tools/test_apps/system/build_test/sdkconfig.ci.usb_serial_jtag index 81161641fa..5e9f8e25bd 100644 --- a/tools/test_apps/system/build_test/sdkconfig.ci.usb_serial_jtag +++ b/tools/test_apps/system/build_test/sdkconfig.ci.usb_serial_jtag @@ -1,2 +1 @@ -CONFIG_IDF_TARGET="esp32c3" CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y