From 24ef7f6034bbcc0d27625c3931433f528b218b48 Mon Sep 17 00:00:00 2001 From: Xiao Xufeng Date: Fri, 7 Jul 2023 01:48:54 +0800 Subject: [PATCH] ci(ram_load_app): enable target tests for all targets --- tools/test_apps/.build-test-rules.yml | 6 ------ tools/test_apps/system/ram_loadable_app/README.md | 4 ++-- .../ram_loadable_app/pytest_ram_loadable_app.py | 13 ++----------- .../ram_loadable_app/sdkconfig.defaults.esp32 | 6 ------ 4 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 tools/test_apps/system/ram_loadable_app/sdkconfig.defaults.esp32 diff --git a/tools/test_apps/.build-test-rules.yml b/tools/test_apps/.build-test-rules.yml index 5cf3291d28..faef23a9e2 100644 --- a/tools/test_apps/.build-test-rules.yml +++ b/tools/test_apps/.build-test-rules.yml @@ -173,12 +173,6 @@ tools/test_apps/system/panic: temporary: true reason: target(s) not supported yet # TODO: IDF-7511 -tools/test_apps/system/ram_loadable_app: - disable: - - if: IDF_TARGET == "esp32h2" - temporary: true - reason: lack of runners - tools/test_apps/system/startup: disable: - if: CONFIG_NAME == "main_task_cpu1" and IDF_TARGET not in ["esp32", "esp32s3"] diff --git a/tools/test_apps/system/ram_loadable_app/README.md b/tools/test_apps/system/ram_loadable_app/README.md index f535057154..0283938f98 100644 --- a/tools/test_apps/system/ram_loadable_app/README.md +++ b/tools/test_apps/system/ram_loadable_app/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-P4 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | # RAM loadable app Example diff --git a/tools/test_apps/system/ram_loadable_app/pytest_ram_loadable_app.py b/tools/test_apps/system/ram_loadable_app/pytest_ram_loadable_app.py index 71953f16f2..22b6011a38 100644 --- a/tools/test_apps/system/ram_loadable_app/pytest_ram_loadable_app.py +++ b/tools/test_apps/system/ram_loadable_app/pytest_ram_loadable_app.py @@ -5,12 +5,7 @@ import pytest from pytest_embedded_idf.dut import IdfDut -@pytest.mark.esp32 -@pytest.mark.esp32c2 -@pytest.mark.esp32c3 -@pytest.mark.esp32c6 -@pytest.mark.esp32s2 -@pytest.mark.esp32s3 +@pytest.mark.supported_targets @pytest.mark.generic @pytest.mark.parametrize('config', ['pure_ram',], indirect=True,) def test_pure_ram_loadable_app(dut: IdfDut) -> None: @@ -18,11 +13,7 @@ def test_pure_ram_loadable_app(dut: IdfDut) -> None: dut.expect('Time since boot: 3 seconds...', timeout=10) -@pytest.mark.esp32c2 -@pytest.mark.esp32c3 -@pytest.mark.esp32c6 -@pytest.mark.esp32s2 -@pytest.mark.esp32s3 +@pytest.mark.supported_targets @pytest.mark.generic @pytest.mark.parametrize('config', ['defaults',], indirect=True,) def test_ram_loadable_app(dut: IdfDut) -> None: diff --git a/tools/test_apps/system/ram_loadable_app/sdkconfig.defaults.esp32 b/tools/test_apps/system/ram_loadable_app/sdkconfig.defaults.esp32 deleted file mode 100644 index d2816a3ebd..0000000000 --- a/tools/test_apps/system/ram_loadable_app/sdkconfig.defaults.esp32 +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_APP_BUILD_TYPE_RAM=y - -# Reset is meaningless to ram_app -CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y - -CONFIG_APP_BUILD_TYPE_PURE_RAM_APP=y