From b6d3e1e8e313201f2e4166b7f90142db25f0fff6 Mon Sep 17 00:00:00 2001 From: Marius Vikhammer Date: Thu, 4 Jul 2024 13:00:56 +0800 Subject: [PATCH] test(newlib): fixed newlib test failing to build for C5 --- components/newlib/test_apps/.build-test-rules.yml | 4 ---- components/newlib/test_apps/newlib/README.md | 4 ++-- components/newlib/test_apps/newlib/main/CMakeLists.txt | 2 +- components/newlib/test_apps/newlib/main/test_time.c | 2 ++ components/newlib/test_apps/newlib/pytest_newlib.py | 1 - 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/components/newlib/test_apps/.build-test-rules.yml b/components/newlib/test_apps/.build-test-rules.yml index fcc2d44faf..8383b02ebc 100644 --- a/components/newlib/test_apps/.build-test-rules.yml +++ b/components/newlib/test_apps/.build-test-rules.yml @@ -1,7 +1,3 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps components/newlib/test_apps/newlib: - disable: - - if: IDF_TARGET == "esp32c5" - temporary: true - reason: not supported yet # TODO: [ESP32C5] IDF-8675, IDF-10312 diff --git a/components/newlib/test_apps/newlib/README.md b/components/newlib/test_apps/newlib/README.md index bf47d80ec6..3a502b1f86 100644 --- a/components/newlib/test_apps/newlib/README.md +++ b/components/newlib/test_apps/newlib/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/newlib/test_apps/newlib/main/CMakeLists.txt b/components/newlib/test_apps/newlib/main/CMakeLists.txt index 34ce489cd0..ec619cce43 100644 --- a/components/newlib/test_apps/newlib/main/CMakeLists.txt +++ b/components/newlib/test_apps/newlib/main/CMakeLists.txt @@ -9,5 +9,5 @@ idf_component_register(SRCS "test_setjmp.c" "test_stdatomic.c" "test_time.c" - PRIV_REQUIRES unity vfs cmock driver esp_timer spi_flash test_utils pthread esp_psram + PRIV_REQUIRES unity vfs cmock esp_timer spi_flash test_utils pthread esp_psram WHOLE_ARCHIVE) diff --git a/components/newlib/test_apps/newlib/main/test_time.c b/components/newlib/test_apps/newlib/main/test_time.c index 37b7e78c2e..584b658880 100644 --- a/components/newlib/test_apps/newlib/main/test_time.c +++ b/components/newlib/test_apps/newlib/main/test_time.c @@ -43,6 +43,8 @@ #include "esp32h2/rtc.h" #elif CONFIG_IDF_TARGET_ESP32P4 #include "esp32p4/rtc.h" +#elif CONFIG_IDF_TARGET_ESP32C5 +#include "esp32c5/rtc.h" #endif #if SOC_CACHE_INTERNAL_MEM_VIA_L1CACHE diff --git a/components/newlib/test_apps/newlib/pytest_newlib.py b/components/newlib/test_apps/newlib/pytest_newlib.py index 3d59ed842f..78c01517d5 100644 --- a/components/newlib/test_apps/newlib/pytest_newlib.py +++ b/components/newlib/test_apps/newlib/pytest_newlib.py @@ -31,7 +31,6 @@ def validate_sbom(dut: Dut) -> None: @pytest.mark.generic -@pytest.mark.temp_skip_ci(targets=['esp32c5'], reason='not support yet') # TODO: [ESP32C5] IDF-8675, IDF-10312 @pytest.mark.parametrize( 'config', [