From 3c4bcb4da50b046776cd44765f6f9063f4ffdc15 Mon Sep 17 00:00:00 2001 From: Marius Vikhammer Date: Mon, 21 Sep 2026 09:04:05 +0800 Subject: [PATCH 1/2] fix(test_apps): drop obsolete esp_hw_support to esp_pm violation The G1 dependency check fails when an expected extra dependency is no longer present after the real component edge was removed. --- tools/test_apps/system/g1_components/check_dependencies.py | 2 +- tools/test_apps/system/g1_components/g1_check.cmake | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/test_apps/system/g1_components/check_dependencies.py b/tools/test_apps/system/g1_components/check_dependencies.py index f4478511965..5ff6ab38895 100644 --- a/tools/test_apps/system/g1_components/check_dependencies.py +++ b/tools/test_apps/system/g1_components/check_dependencies.py @@ -54,7 +54,7 @@ g1_g0_components = g1_g0_components_base + get_all_esp_hal_components() # Global expected dependency violations that apply to all targets expected_dep_violations = { 'esp_system': ['esp_timer', 'bootloader_support', 'esp_pm'], - 'esp_hw_support': ['efuse', 'bootloader_support', 'esp_driver_gpio', 'esp_timer', 'esp_pm'], + 'esp_hw_support': ['efuse', 'bootloader_support', 'esp_driver_gpio', 'esp_timer'], # efuse: esp_mspi_align queries the flash encryption state to derive MSPI buffer alignment 'esp_mspi': ['bootloader_support', 'efuse'], 'cxx': ['pthread'], diff --git a/tools/test_apps/system/g1_components/g1_check.cmake b/tools/test_apps/system/g1_components/g1_check.cmake index 4f5787a6bc2..baa82ee6be1 100644 --- a/tools/test_apps/system/g1_components/g1_check.cmake +++ b/tools/test_apps/system/g1_components/g1_check.cmake @@ -44,7 +44,6 @@ set(extra_components_which_shouldnt_be_included # esp_pm is pulled in by esp_system due to pm_init and freertos idle hook # both could be moved to pm component if esp-system idle hook provided a way to register hooks - # esp_hw_support dependency seems like it could be removed? # It is also used by esp_driver_gpio, which should be removed from G1-only build. # IDF-10415 esp_pm From 57f1a2a260765c6163d30a0983428b1954ecdc44 Mon Sep 17 00:00:00 2001 From: Marius Vikhammer Date: Mon, 21 Sep 2026 09:16:14 +0800 Subject: [PATCH 2/2] fix(ci): close missing quote in system build-test-rules if clause An unclosed string made the whole system test-app manifest invalid, so the auto-suspend disable rule never applied to ESP32-S2. --- tools/test_apps/system/.build-test-rules.yml | 2 +- .../system/flash_auto_suspend_iram_reduction/README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/test_apps/system/.build-test-rules.yml b/tools/test_apps/system/.build-test-rules.yml index 3f9bf6dfdcf..6aed0e809d6 100644 --- a/tools/test_apps/system/.build-test-rules.yml +++ b/tools/test_apps/system/.build-test-rules.yml @@ -70,7 +70,7 @@ tools/test_apps/system/esp_intr_dump: tools/test_apps/system/flash_auto_suspend_iram_reduction: disable: - - if: IDF_TARGET == "esp32" or IDF_TARGET == "esp32s2 + - if: IDF_TARGET == "esp32" or IDF_TARGET == "esp32s2" reason: Targets do not support auto-suspend disable_test: - if: IDF_TARGET != "esp32c3" diff --git a/tools/test_apps/system/flash_auto_suspend_iram_reduction/README.md b/tools/test_apps/system/flash_auto_suspend_iram_reduction/README.md index c5f27873efd..224514ad6c2 100644 --- a/tools/test_apps/system/flash_auto_suspend_iram_reduction/README.md +++ b/tools/test_apps/system/flash_auto_suspend_iram_reduction/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-P4 | ESP32-S2 | ESP32-S3 | ESP32-S31 | -| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | -------- | -------- | --------- | +| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-P4 | ESP32-S3 | ESP32-S31 | +| ----------------- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | -------- | --------- |