From f1d9e03864fb5f2c0f22735cf260d8ade275e4e5 Mon Sep 17 00:00:00 2001 From: Marius Vikhammer Date: Mon, 2 Feb 2026 13:10:09 +0800 Subject: [PATCH] ci(esp32s31): re-enable tests for hw_support, stdio, console, select, and startup_time Re-enable ESP32S31 support for multiple test apps and examples: - hw_support unity tests (with RWDT reset reason fix) - eventfd example (select functionality) - stdio test app - console test app and examples - startup_time example --- components/esp_hw_support/test_apps/.build-test-rules.yml | 3 --- .../test_apps/esp_hw_support_unity_tests/README.md | 4 ++-- .../test_apps/esp_hw_support_unity_tests/main/test_rtc_wdt.c | 4 ++-- examples/system/.build-test-rules.yml | 2 +- examples/system/eventfd/README.md | 4 ++-- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/components/esp_hw_support/test_apps/.build-test-rules.yml b/components/esp_hw_support/test_apps/.build-test-rules.yml index 514831b0b2..eacac23ec6 100644 --- a/components/esp_hw_support/test_apps/.build-test-rules.yml +++ b/components/esp_hw_support/test_apps/.build-test-rules.yml @@ -1,9 +1,6 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps components/esp_hw_support/test_apps/esp_hw_support_unity_tests: - disable: - - if: IDF_TARGET in ["esp32s31"] # TODO: [ESP32S31] IDF-14672 - reason: not support yet components/esp_hw_support/test_apps/host_test_linux: enable: diff --git a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/README.md b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/README.md index 44f3780f1d..d76348d52c 100644 --- a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/README.md +++ b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-P4 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-P4 | ESP32-S2 | ESP32-S3 | ESP32-S31 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | -------- | -------- | --------- | diff --git a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/main/test_rtc_wdt.c b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/main/test_rtc_wdt.c index c7bfdde323..6b05e3d70f 100644 --- a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/main/test_rtc_wdt.c +++ b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/main/test_rtc_wdt.c @@ -226,7 +226,7 @@ static void rtc_wdt_deep_sleep_prepare_timeout(void) static void rtc_wdt_verify_SYSTEM_reset(void) { printf("Confirming if reset reason matches 0x9 (main system reset)\n"); -#if CONFIG_IDF_TARGET_ESP32P4 +#if CONFIG_IDF_TARGET_ESP32P4 || CONFIG_IDF_TARGET_ESP32S31 TEST_ASSERT_EQUAL(RESET_REASON_CORE_RWDT, esp_rom_get_reset_reason(CONFIG_ESP_MAIN_TASK_AFFINITY)); #else TEST_ASSERT_EQUAL(RESET_REASON_CORE_RTC_WDT, esp_rom_get_reset_reason(CONFIG_ESP_MAIN_TASK_AFFINITY)); @@ -236,7 +236,7 @@ static void rtc_wdt_verify_SYSTEM_reset(void) static void rtc_wdt_verify_RTC_reset(void) { printf("Confirming if reset reason matches 0x10 (main system + RTC reset)\n"); -#if CONFIG_IDF_TARGET_ESP32P4 +#if CONFIG_IDF_TARGET_ESP32P4 || CONFIG_IDF_TARGET_ESP32S31 TEST_ASSERT_EQUAL(RESET_REASON_SYS_RWDT, esp_rom_get_reset_reason(CONFIG_ESP_MAIN_TASK_AFFINITY)); #else TEST_ASSERT_EQUAL(RESET_REASON_SYS_RTC_WDT, esp_rom_get_reset_reason(CONFIG_ESP_MAIN_TASK_AFFINITY)); diff --git a/examples/system/.build-test-rules.yml b/examples/system/.build-test-rules.yml index dc50850109..4996efe92b 100644 --- a/examples/system/.build-test-rules.yml +++ b/examples/system/.build-test-rules.yml @@ -59,7 +59,7 @@ examples/system/esp_timer: examples/system/eventfd: disable: - - if: SOC_GPTIMER_SUPPORTED != 1 and (IDF_TARGET != "esp32" and (NIGHTLY_RUN != "1" or IDF_TARGET == "linux")) or IDF_TARGET in ["esp32s31"] # TODO: [ESP32S31] IDF-14932 + - if: SOC_GPTIMER_SUPPORTED != 1 and (IDF_TARGET != "esp32" and (NIGHTLY_RUN != "1" or IDF_TARGET == "linux")) reason: no target specific functionality, testing on a single target is sufficient depends_components: - vfs diff --git a/examples/system/eventfd/README.md b/examples/system/eventfd/README.md index a95c4929cb..6fa904ce6d 100644 --- a/examples/system/eventfd/README.md +++ b/examples/system/eventfd/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-P4 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-H21 | ESP32-H4 | ESP32-P4 | ESP32-S2 | ESP32-S3 | ESP32-S31 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | --------- | -------- | -------- | -------- | -------- | --------- | # eventfd example