From fa532d03481ce85e05760b7305c874fa4c8b68f2 Mon Sep 17 00:00:00 2001 From: hebinglin Date: Tue, 13 Jan 2026 11:36:31 +0800 Subject: [PATCH] change(esp_system): replace temp_skip_ci with soc_filtered_targets for esp32c5 --- .../test_apps/gptimer/pytest_gptimer.py | 6 ++++-- .../esp_driver_ledc/test_apps/ledc/pytest_ledc.py | 6 ++++-- .../test_apps/sigma_delta/pytest_sigma_delta.py | 4 ++-- .../test_apps/master/pytest_spi_master.py | 6 ++++-- .../test_apps/slave/pytest_spi_slave.py | 6 ++++-- .../test_apps/slave_hd/pytest_spi_slave_hd.py | 7 +++++-- .../pytest_esp_hw_support.py | 8 ++++++-- .../pytest_esp_system_unity_tests.py | 14 +++++++++----- 8 files changed, 38 insertions(+), 19 deletions(-) diff --git a/components/esp_driver_gptimer/test_apps/gptimer/pytest_gptimer.py b/components/esp_driver_gptimer/test_apps/gptimer/pytest_gptimer.py index 1bf4943efd..ab1886a3f5 100644 --- a/components/esp_driver_gptimer/test_apps/gptimer/pytest_gptimer.py +++ b/components/esp_driver_gptimer/test_apps/gptimer/pytest_gptimer.py @@ -3,10 +3,10 @@ import pytest from pytest_embedded import Dut from pytest_embedded_idf.utils import idf_parametrize +from pytest_embedded_idf.utils import soc_filtered_targets @pytest.mark.generic -@pytest.mark.temp_skip_ci(targets=['esp32c5'], reason='c5 eco2 does not support top pd') @pytest.mark.parametrize( 'config', [ @@ -15,7 +15,9 @@ from pytest_embedded_idf.utils import idf_parametrize ], indirect=True, ) -@idf_parametrize('target', ['supported_targets'], indirect=['target']) +@idf_parametrize( + 'target', soc_filtered_targets('SOC_GPTIMER_SUPPORTED == 1 and IDF_TARGET not in ["esp32c5"]'), indirect=['target'] +) def test_gptimer(dut: Dut) -> None: dut.run_all_single_board_cases() diff --git a/components/esp_driver_ledc/test_apps/ledc/pytest_ledc.py b/components/esp_driver_ledc/test_apps/ledc/pytest_ledc.py index c828181ed6..e940c69295 100644 --- a/components/esp_driver_ledc/test_apps/ledc/pytest_ledc.py +++ b/components/esp_driver_ledc/test_apps/ledc/pytest_ledc.py @@ -3,10 +3,10 @@ import pytest from pytest_embedded_idf import IdfDut from pytest_embedded_idf.utils import idf_parametrize +from pytest_embedded_idf.utils import soc_filtered_targets @pytest.mark.temp_skip_ci(targets=['esp32s3'], reason='skip due to duplication with test_ledc_psram') -@pytest.mark.temp_skip_ci(targets=['esp32c5'], reason='c5 eco2 does not support top pd') @pytest.mark.generic @pytest.mark.parametrize( 'config', @@ -16,7 +16,9 @@ from pytest_embedded_idf.utils import idf_parametrize ], indirect=True, ) -@idf_parametrize('target', ['supported_targets'], indirect=['target']) +@idf_parametrize( + 'target', soc_filtered_targets('SOC_LEDC_SUPPORTED == 1 and IDF_TARGET not in ["esp32c5"]'), indirect=['target'] +) def test_ledc(dut: IdfDut) -> None: dut.run_all_single_board_cases(reset=True) diff --git a/components/esp_driver_sdm/test_apps/sigma_delta/pytest_sigma_delta.py b/components/esp_driver_sdm/test_apps/sigma_delta/pytest_sigma_delta.py index 7e3f6cb8c6..1c24e74114 100644 --- a/components/esp_driver_sdm/test_apps/sigma_delta/pytest_sigma_delta.py +++ b/components/esp_driver_sdm/test_apps/sigma_delta/pytest_sigma_delta.py @@ -12,11 +12,10 @@ CONFIGS = [ @pytest.mark.generic -@pytest.mark.temp_skip_ci(targets=['esp32c5'], reason='c5 eco2 does not support top pd') @pytest.mark.parametrize('config', CONFIGS, indirect=True) @idf_parametrize( 'target', - soc_filtered_targets('SOC_SDM_SUPPORTED == 1'), + soc_filtered_targets('SOC_SDM_SUPPORTED == 1 and IDF_TARGET not in ["esp32c5"]'), indirect=['target'], ) def test_sdm(dut: IdfDut) -> None: @@ -33,5 +32,6 @@ def test_sdm_esp32c5(dut: IdfDut) -> None: @pytest.mark.generic @pytest.mark.esp32c5_eco3 @pytest.mark.parametrize('config', ['release'], indirect=True) +@idf_parametrize('target', ['esp32c5'], indirect=['target']) def test_sdm_esp32c5_eco3(dut: IdfDut) -> None: dut.run_all_single_board_cases(group='sdm') diff --git a/components/esp_driver_spi/test_apps/master/pytest_spi_master.py b/components/esp_driver_spi/test_apps/master/pytest_spi_master.py index 1338157266..3936c133ae 100644 --- a/components/esp_driver_spi/test_apps/master/pytest_spi_master.py +++ b/components/esp_driver_spi/test_apps/master/pytest_spi_master.py @@ -2,10 +2,10 @@ # SPDX-License-Identifier: Apache-2.0 import pytest from pytest_embedded_idf.utils import idf_parametrize +from pytest_embedded_idf.utils import soc_filtered_targets @pytest.mark.generic -@pytest.mark.temp_skip_ci(targets=['esp32c5'], reason='c5 eco2 does not support top pd') @pytest.mark.parametrize( 'config', [ @@ -14,7 +14,9 @@ from pytest_embedded_idf.utils import idf_parametrize ], indirect=True, ) -@idf_parametrize('target', ['supported_targets'], indirect=['target']) +@idf_parametrize( + 'target', soc_filtered_targets('SOC_GPSPI_SUPPORTED == 1 and IDF_TARGET not in ["esp32c5"]'), indirect=['target'] +) def test_master_single_dev(case_tester) -> None: # type: ignore for case in case_tester.test_menu: if 'test_env' in case.attributes: diff --git a/components/esp_driver_spi/test_apps/slave/pytest_spi_slave.py b/components/esp_driver_spi/test_apps/slave/pytest_spi_slave.py index afece8a2b1..12a753c9e4 100644 --- a/components/esp_driver_spi/test_apps/slave/pytest_spi_slave.py +++ b/components/esp_driver_spi/test_apps/slave/pytest_spi_slave.py @@ -2,12 +2,14 @@ # SPDX-License-Identifier: Apache-2.0 import pytest from pytest_embedded_idf.utils import idf_parametrize +from pytest_embedded_idf.utils import soc_filtered_targets @pytest.mark.generic -@pytest.mark.temp_skip_ci(targets=['esp32c5'], reason='c5 eco2 does not support top pd') @pytest.mark.parametrize('config', ['release', 'iram_safe'], indirect=True) -@idf_parametrize('target', ['supported_targets'], indirect=['target']) +@idf_parametrize( + 'target', soc_filtered_targets('SOC_GPSPI_SUPPORTED == 1 and IDF_TARGET not in ["esp32c5"]'), indirect=['target'] +) def test_slave_single_dev(case_tester) -> None: # type: ignore case_tester.run_all_normal_cases(reset=True) diff --git a/components/esp_driver_spi/test_apps/slave_hd/pytest_spi_slave_hd.py b/components/esp_driver_spi/test_apps/slave_hd/pytest_spi_slave_hd.py index 8019d02970..5f44b982c0 100644 --- a/components/esp_driver_spi/test_apps/slave_hd/pytest_spi_slave_hd.py +++ b/components/esp_driver_spi/test_apps/slave_hd/pytest_spi_slave_hd.py @@ -7,9 +7,12 @@ from pytest_embedded_idf.utils import soc_filtered_targets @pytest.mark.generic -@pytest.mark.temp_skip_ci(targets=['esp32c5'], reason='c5 eco2 does not support top pd') @pytest.mark.parametrize('config', ['release'], indirect=True) -@idf_parametrize('target', soc_filtered_targets('SOC_SPI_SUPPORT_SLAVE_HD_VER2 == 1'), indirect=['target']) +@idf_parametrize( + 'target', + soc_filtered_targets('SOC_SPI_SUPPORT_SLAVE_HD_VER2 == 1 and IDF_TARGET not in ["esp32c5"]'), + indirect=['target'], +) def test_slave_hd_single_dev(case_tester) -> None: # type: ignore case_tester.run_all_normal_cases(reset=True, timeout=180) diff --git a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/pytest_esp_hw_support.py b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/pytest_esp_hw_support.py index dcbac0e19b..e33083f6c8 100644 --- a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/pytest_esp_hw_support.py +++ b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/pytest_esp_hw_support.py @@ -3,13 +3,17 @@ import pytest from pytest_embedded import Dut from pytest_embedded_idf.utils import idf_parametrize +from pytest_embedded_idf.utils import soc_filtered_targets @pytest.mark.generic -@pytest.mark.temp_skip_ci(targets=['esp32c5'], reason='c5 eco2 does not support top pd') @idf_parametrize( 'config,target', - [('single_core_esp32', 'esp32'), ('default', 'supported_targets'), ('release', 'supported_targets')], + [ + ('single_core_esp32', 'esp32'), + *(('default', target) for target in soc_filtered_targets('IDF_TARGET not in ["esp32c5"]')), + *(('release', target) for target in soc_filtered_targets('IDF_TARGET not in ["esp32c5"]')), + ], indirect=['config', 'target'], ) def test_esp_hw_support(dut: Dut) -> None: diff --git a/components/esp_system/test_apps/esp_system_unity_tests/pytest_esp_system_unity_tests.py b/components/esp_system/test_apps/esp_system_unity_tests/pytest_esp_system_unity_tests.py index 38a0dffad0..fd9c41df89 100644 --- a/components/esp_system/test_apps/esp_system_unity_tests/pytest_esp_system_unity_tests.py +++ b/components/esp_system/test_apps/esp_system_unity_tests/pytest_esp_system_unity_tests.py @@ -9,16 +9,20 @@ from pytest_embedded_idf.utils import soc_filtered_targets @pytest.mark.generic -@pytest.mark.temp_skip_ci(targets=['esp32c5'], reason='c5 eco2 does not support top pd') @idf_parametrize( 'config,target', [ - ('default', 'supported_targets'), - ('pd_vddsdio', 'supported_targets'), - *(('psram', target) for target in soc_filtered_targets('SOC_SPIRAM_SUPPORTED == 1')), + *(('default', target) for target in soc_filtered_targets('IDF_TARGET not in ["esp32c5"]')), + *(('pd_vddsdio', target) for target in soc_filtered_targets('IDF_TARGET not in ["esp32c5"]')), + *( + ('psram', target) + for target in soc_filtered_targets('SOC_SPIRAM_SUPPORTED == 1 and IDF_TARGET not in ["esp32c5"]') + ), *( ('psram_with_pd_top', target) - for target in soc_filtered_targets('SOC_SPIRAM_SUPPORTED == 1 and SOC_PM_SUPPORT_TOP_PD == 1') + for target in soc_filtered_targets( + 'SOC_SPIRAM_SUPPORTED == 1 and SOC_PM_SUPPORT_TOP_PD == 1 and IDF_TARGET not in ["esp32c5"]' + ) ), ('single_core_esp32', 'esp32'), ],