From 7466ddfa8c9ffb840f633e9b9a300fb3a768c2b0 Mon Sep 17 00:00:00 2001 From: Song Ruo Jing Date: Tue, 22 Nov 2022 17:01:25 +0800 Subject: [PATCH] ci: Make consistence between pytest_*.py and .build-test-rules.yml for esp32c6 (i.e. to pass check_test_scripts_build_test_rules.py) --- .../test_apps/pytest_app_update_ut.py | 1 + .../bootloader_support/.build-test-rules.yml | 4 ++++ components/driver/.build-test-rules.yml | 18 -------------- .../pytest_legacy_mcpwm.py | 1 + .../pytest_legacy_rmt_driver.py | 1 + .../pytest_legacy_temp_sensor_driver.py | 1 + .../driver/test_apps/mcpwm/pytest_mcpwm.py | 1 + components/driver/test_apps/rmt/pytest_rmt.py | 1 + components/driver/test_apps/sdm/pytest_sdm.py | 1 + .../driver/test_apps/spi/master/README.md | 4 ++-- .../test_apps/spi/master/pytest_spi_master.py | 2 +- .../driver/test_apps/spi/slave/README.md | 4 ++-- .../test_apps/spi/slave/pytest_spi_slave.py | 2 +- .../driver/test_apps/spi/slave_hd/README.md | 4 ++-- .../spi/slave_hd/pytest_spi_slave_hd.py | 2 +- .../pytest_temperature_sensor.py | 1 + components/efuse/test_apps/pytest_efuse.py | 1 + .../test_apps/dma/pytest_dma.py | 1 + .../test_apps/rtc_clk/pytest_rtc_clk.py | 1 + components/esp_lcd/.build-test-rules.yml | 12 ---------- .../esp_lcd/test_apps/i2c_lcd/README.md | 4 ++-- .../esp_lcd/test_apps/spi_lcd/README.md | 4 ++-- .../esp_rom/test_apps/pytest_esp_rom.py | 1 + components/esp_system/.build-test-rules.yml | 6 +++++ .../test_apps/rtc_8md256/pytest_rtc_8md256.py | 5 +++- .../test_apps/pytest_esp_timer_ut.py | 4 ++-- .../wifi_function/pytest_wifi_function.py | 1 + components/newlib/test_apps/pytest_newlib.py | 1 + components/spi_flash/.build-test-rules.yml | 2 +- .../test_apps/flash_mmap/pytest_mmap.py | 1 + examples/build_system/.build-test-rules.yml | 2 +- .../mcpwm_capture_hc_sr04/pytest_hc_sr04.py | 1 + .../pytest_servo_mg996r.py | 1 + .../mcpwm/mcpwm_sync/pytest_mcpwm_sync.py | 1 + .../rmt/dshot_esc/pytest_dshot_esc.py | 1 + .../rmt/led_strip/pytest_led_strip.py | 1 + .../musical_buzzer/pytest_musical_buzzer.py | 1 + .../onewire_ds18b20/pytest_onewire_ds18b20.py | 1 + .../rmt/stepper_motor/pytest_stepper_motor.py | 1 + .../sigma_delta/pytest_sdm_example.py | 1 + .../temp_sensor/pytest_temp_sensor_example.py | 1 + .../esp_http_client/pytest_esp_http_client.py | 10 +++++++- .../esp_local_ctrl/pytest_esp_local_ctrl.py | 1 + .../https_request/pytest_https_request.py | 1 + examples/security/.build-test-rules.yml | 2 +- examples/storage/.build-test-rules.yml | 24 +++++++++---------- examples/system/.build-test-rules.yml | 5 +++- examples/system/eventfd/pytest_eventfd.py | 1 + .../native_ota_example/pytest_native_ota.py | 5 ++++ examples/system/ota/otatool/pytest_otatool.py | 1 + examples/system/select/pytest_select.py | 1 + .../task_watchdog/pytest_task_watchdog.py | 1 + 52 files changed, 93 insertions(+), 63 deletions(-) diff --git a/components/app_update/test_apps/pytest_app_update_ut.py b/components/app_update/test_apps/pytest_app_update_ut.py index e30eec250c..286994813f 100644 --- a/components/app_update/test_apps/pytest_app_update_ut.py +++ b/components/app_update/test_apps/pytest_app_update_ut.py @@ -19,6 +19,7 @@ def run_multiple_stages(dut: Dut, test_case_num: int, stages: int) -> None: @pytest.mark.supported_targets +@pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='c6 support TBD') @pytest.mark.generic def test_app_update(dut: Dut) -> None: extra_data = dut.parse_test_menu() diff --git a/components/bootloader_support/.build-test-rules.yml b/components/bootloader_support/.build-test-rules.yml index 935c7d342e..f13bfd6485 100644 --- a/components/bootloader_support/.build-test-rules.yml +++ b/components/bootloader_support/.build-test-rules.yml @@ -5,3 +5,7 @@ components/bootloader_support/test_apps/rtc_custom_section: - if: IDF_TARGET == "esp32c2" temporary: false reason: esp32c2 does not have RTC memory + disable_test: + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet diff --git a/components/driver/.build-test-rules.yml b/components/driver/.build-test-rules.yml index 7a3c77dd99..84d13b4918 100644 --- a/components/driver/.build-test-rules.yml +++ b/components/driver/.build-test-rules.yml @@ -73,24 +73,6 @@ components/driver/test_apps/sdm: disable: - if: SOC_SDM_SUPPORTED != 1 -components/driver/test_apps/spi/master: - disable: - - if: IDF_TARGET == "esp32c6" - temporary: true - reason: target esp32c6 is not supported yet - -components/driver/test_apps/spi/slave: - disable: - - if: IDF_TARGET == "esp32c6" - temporary: true - reason: target esp32c6 is not supported yet - -components/driver/test_apps/spi/slave_hd: - disable: - - if: IDF_TARGET == "esp32c6" - temporary: true - reason: target esp32c6 is not supported yet - components/driver/test_apps/temperature_sensor: disable: - if: SOC_TEMP_SENSOR_SUPPORTED != 1 diff --git a/components/driver/test_apps/legacy_mcpwm_driver/pytest_legacy_mcpwm.py b/components/driver/test_apps/legacy_mcpwm_driver/pytest_legacy_mcpwm.py index 25da5646d2..e2ed1b1d4b 100644 --- a/components/driver/test_apps/legacy_mcpwm_driver/pytest_legacy_mcpwm.py +++ b/components/driver/test_apps/legacy_mcpwm_driver/pytest_legacy_mcpwm.py @@ -7,6 +7,7 @@ from pytest_embedded import Dut @pytest.mark.esp32 @pytest.mark.esp32s3 +@pytest.mark.esp32c6 @pytest.mark.generic @pytest.mark.parametrize( 'config', diff --git a/components/driver/test_apps/legacy_rmt_driver/pytest_legacy_rmt_driver.py b/components/driver/test_apps/legacy_rmt_driver/pytest_legacy_rmt_driver.py index 84b97179c9..d0ebfc47d0 100644 --- a/components/driver/test_apps/legacy_rmt_driver/pytest_legacy_rmt_driver.py +++ b/components/driver/test_apps/legacy_rmt_driver/pytest_legacy_rmt_driver.py @@ -9,6 +9,7 @@ from pytest_embedded import Dut @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.esp32c3 +@pytest.mark.esp32c6 @pytest.mark.generic @pytest.mark.parametrize('config', [ 'release', diff --git a/components/driver/test_apps/legacy_rtc_temp_driver/pytest_legacy_temp_sensor_driver.py b/components/driver/test_apps/legacy_rtc_temp_driver/pytest_legacy_temp_sensor_driver.py index e29d1e1f90..98027b4c6d 100644 --- a/components/driver/test_apps/legacy_rtc_temp_driver/pytest_legacy_temp_sensor_driver.py +++ b/components/driver/test_apps/legacy_rtc_temp_driver/pytest_legacy_temp_sensor_driver.py @@ -9,6 +9,7 @@ from pytest_embedded import Dut @pytest.mark.esp32c3 @pytest.mark.esp32s3 @pytest.mark.esp32c2 +@pytest.mark.esp32c6 @pytest.mark.generic @pytest.mark.parametrize('config', [ 'release', diff --git a/components/driver/test_apps/mcpwm/pytest_mcpwm.py b/components/driver/test_apps/mcpwm/pytest_mcpwm.py index 6def6d2cf4..427d6d062c 100644 --- a/components/driver/test_apps/mcpwm/pytest_mcpwm.py +++ b/components/driver/test_apps/mcpwm/pytest_mcpwm.py @@ -7,6 +7,7 @@ from pytest_embedded import Dut @pytest.mark.esp32 @pytest.mark.esp32s3 +@pytest.mark.esp32c6 @pytest.mark.generic @pytest.mark.parametrize( 'config', diff --git a/components/driver/test_apps/rmt/pytest_rmt.py b/components/driver/test_apps/rmt/pytest_rmt.py index 441f669120..61ac424f66 100644 --- a/components/driver/test_apps/rmt/pytest_rmt.py +++ b/components/driver/test_apps/rmt/pytest_rmt.py @@ -9,6 +9,7 @@ from pytest_embedded import Dut @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.esp32c3 +@pytest.mark.esp32c6 @pytest.mark.generic @pytest.mark.parametrize( 'config', diff --git a/components/driver/test_apps/sdm/pytest_sdm.py b/components/driver/test_apps/sdm/pytest_sdm.py index 4f36a104e0..d40b9ee056 100644 --- a/components/driver/test_apps/sdm/pytest_sdm.py +++ b/components/driver/test_apps/sdm/pytest_sdm.py @@ -9,6 +9,7 @@ from pytest_embedded import Dut @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.esp32c3 +@pytest.mark.esp32c6 @pytest.mark.generic @pytest.mark.parametrize( 'config', diff --git a/components/driver/test_apps/spi/master/README.md b/components/driver/test_apps/spi/master/README.md index 284564238d..2beabff547 100644 --- a/components/driver/test_apps/spi/master/README.md +++ b/components/driver/test_apps/spi/master/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | \ No newline at end of file +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | \ No newline at end of file diff --git a/components/driver/test_apps/spi/master/pytest_spi_master.py b/components/driver/test_apps/spi/master/pytest_spi_master.py index 139f5901d2..7066edbc3b 100644 --- a/components/driver/test_apps/spi/master/pytest_spi_master.py +++ b/components/driver/test_apps/spi/master/pytest_spi_master.py @@ -5,7 +5,6 @@ import pytest # If `test_env` is define, should not run on generic runner -@pytest.mark.esp32c6 @pytest.mark.supported_targets @pytest.mark.generic def test_master_single_dev(case_tester) -> None: # type: ignore @@ -27,6 +26,7 @@ def test_master_esp_flash(case_tester) -> None: # type: ignore # if `test_env` not defined, will run on `generic_multi_device` by default @pytest.mark.supported_targets +@pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='no runner') @pytest.mark.generic_multi_device @pytest.mark.parametrize('count', [2,], indirect=True) def test_master_multi_dev(case_tester) -> None: # type: ignore diff --git a/components/driver/test_apps/spi/slave/README.md b/components/driver/test_apps/spi/slave/README.md index 284564238d..2beabff547 100644 --- a/components/driver/test_apps/spi/slave/README.md +++ b/components/driver/test_apps/spi/slave/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | \ No newline at end of file +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | \ No newline at end of file diff --git a/components/driver/test_apps/spi/slave/pytest_spi_slave.py b/components/driver/test_apps/spi/slave/pytest_spi_slave.py index 6b4fd81a47..55c6aac98c 100644 --- a/components/driver/test_apps/spi/slave/pytest_spi_slave.py +++ b/components/driver/test_apps/spi/slave/pytest_spi_slave.py @@ -5,7 +5,6 @@ import pytest # If `test_env` is define, should not run on generic runner -@pytest.mark.esp32c6 @pytest.mark.supported_targets @pytest.mark.generic def test_slave_single_dev(case_tester) -> None: # type: ignore @@ -17,6 +16,7 @@ def test_slave_single_dev(case_tester) -> None: # type: ignore # if `test_env` not defined, will run on `generic_multi_device` by default @pytest.mark.supported_targets +@pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='no runner') @pytest.mark.generic_multi_device @pytest.mark.parametrize('count', [2,], indirect=True) def test_slave_multi_dev(case_tester) -> None: # type: ignore diff --git a/components/driver/test_apps/spi/slave_hd/README.md b/components/driver/test_apps/spi/slave_hd/README.md index 284564238d..2beabff547 100644 --- a/components/driver/test_apps/spi/slave_hd/README.md +++ b/components/driver/test_apps/spi/slave_hd/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | \ No newline at end of file +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | \ No newline at end of file diff --git a/components/driver/test_apps/spi/slave_hd/pytest_spi_slave_hd.py b/components/driver/test_apps/spi/slave_hd/pytest_spi_slave_hd.py index 6a41d81333..644cab166b 100644 --- a/components/driver/test_apps/spi/slave_hd/pytest_spi_slave_hd.py +++ b/components/driver/test_apps/spi/slave_hd/pytest_spi_slave_hd.py @@ -5,7 +5,6 @@ import pytest # If `test_env` is define, should not run on generic runner -@pytest.mark.esp32c6 @pytest.mark.supported_targets @pytest.mark.generic def test_slave_hd_single_dev(case_tester) -> None: # type: ignore @@ -17,6 +16,7 @@ def test_slave_hd_single_dev(case_tester) -> None: # type: ignore # if `test_env` not defined, will run on `generic_multi_device` by default @pytest.mark.supported_targets +@pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='no runner') @pytest.mark.generic_multi_device @pytest.mark.parametrize('count', [2,], indirect=True) def test_slave_hd_multi_dev(case_tester) -> None: # type: ignore diff --git a/components/driver/test_apps/temperature_sensor/pytest_temperature_sensor.py b/components/driver/test_apps/temperature_sensor/pytest_temperature_sensor.py index 12a8c4a56e..317768e8ef 100644 --- a/components/driver/test_apps/temperature_sensor/pytest_temperature_sensor.py +++ b/components/driver/test_apps/temperature_sensor/pytest_temperature_sensor.py @@ -9,6 +9,7 @@ from pytest_embedded import Dut @pytest.mark.esp32c3 @pytest.mark.esp32s3 @pytest.mark.esp32c2 +@pytest.mark.esp32c6 @pytest.mark.generic @pytest.mark.parametrize('config', [ 'release', diff --git a/components/efuse/test_apps/pytest_efuse.py b/components/efuse/test_apps/pytest_efuse.py index ef910095dc..402837ab6a 100644 --- a/components/efuse/test_apps/pytest_efuse.py +++ b/components/efuse/test_apps/pytest_efuse.py @@ -8,6 +8,7 @@ from pytest_embedded import Dut @pytest.mark.esp32 @pytest.mark.esp32c2 @pytest.mark.esp32c3 +@pytest.mark.esp32c6 @pytest.mark.generic def test_efuse(dut: Dut) -> None: dut.expect_exact('Press ENTER to see the list of tests') diff --git a/components/esp_hw_support/test_apps/dma/pytest_dma.py b/components/esp_hw_support/test_apps/dma/pytest_dma.py index d15a0ea289..b45fae6055 100644 --- a/components/esp_hw_support/test_apps/dma/pytest_dma.py +++ b/components/esp_hw_support/test_apps/dma/pytest_dma.py @@ -9,6 +9,7 @@ from pytest_embedded import Dut @pytest.mark.esp32s3 @pytest.mark.esp32c2 @pytest.mark.esp32c3 +@pytest.mark.esp32c6 @pytest.mark.generic @pytest.mark.parametrize( 'config', diff --git a/components/esp_hw_support/test_apps/rtc_clk/pytest_rtc_clk.py b/components/esp_hw_support/test_apps/rtc_clk/pytest_rtc_clk.py index 16768215ed..bc61e04a80 100644 --- a/components/esp_hw_support/test_apps/rtc_clk/pytest_rtc_clk.py +++ b/components/esp_hw_support/test_apps/rtc_clk/pytest_rtc_clk.py @@ -33,5 +33,6 @@ def test_rtc_no_xtal32k(dut: Dut) -> None: @pytest.mark.generic @pytest.mark.supported_targets +@pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='c6 support TBD') def test_rtc_calib(case_tester: Any) -> None: case_tester.run_all_multi_stage_cases() diff --git a/components/esp_lcd/.build-test-rules.yml b/components/esp_lcd/.build-test-rules.yml index 951267c53a..8df02267ec 100644 --- a/components/esp_lcd/.build-test-rules.yml +++ b/components/esp_lcd/.build-test-rules.yml @@ -1,11 +1,5 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps -components/esp_lcd/test_apps/i2c_lcd: - disable: - - if: IDF_TARGET == "esp32c6" - temporary: true - reason: target esp32c6 is not supported yet - components/esp_lcd/test_apps/i80_lcd: disable: - if: SOC_LCD_I80_SUPPORTED != 1 @@ -13,9 +7,3 @@ components/esp_lcd/test_apps/i80_lcd: components/esp_lcd/test_apps/rgb_lcd: disable: - if: SOC_LCD_RGB_SUPPORTED != 1 - -components/esp_lcd/test_apps/spi_lcd: - disable: - - if: IDF_TARGET == "esp32c6" - temporary: true - reason: target esp32c6 is not supported yet diff --git a/components/esp_lcd/test_apps/i2c_lcd/README.md b/components/esp_lcd/test_apps/i2c_lcd/README.md index 863eaede67..b99fe2b5eb 100644 --- a/components/esp_lcd/test_apps/i2c_lcd/README.md +++ b/components/esp_lcd/test_apps/i2c_lcd/README.md @@ -1,4 +1,4 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | This test app is used to test LCDs with I2C interface. diff --git a/components/esp_lcd/test_apps/spi_lcd/README.md b/components/esp_lcd/test_apps/spi_lcd/README.md index bd4250408a..0c052495c6 100644 --- a/components/esp_lcd/test_apps/spi_lcd/README.md +++ b/components/esp_lcd/test_apps/spi_lcd/README.md @@ -1,4 +1,4 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | This test app is used to test LCDs with SPI interface. diff --git a/components/esp_rom/test_apps/pytest_esp_rom.py b/components/esp_rom/test_apps/pytest_esp_rom.py index 9ddf838c2b..ecb961ca75 100644 --- a/components/esp_rom/test_apps/pytest_esp_rom.py +++ b/components/esp_rom/test_apps/pytest_esp_rom.py @@ -8,6 +8,7 @@ from pytest_embedded import Dut @pytest.mark.esp32c3 @pytest.mark.esp32s2 @pytest.mark.esp32s3 +@pytest.mark.esp32c6 @pytest.mark.generic @pytest.mark.nightly_run def test_esp_rom(dut: Dut) -> None: diff --git a/components/esp_system/.build-test-rules.yml b/components/esp_system/.build-test-rules.yml index fbafabf15d..1c0b6b0f7d 100644 --- a/components/esp_system/.build-test-rules.yml +++ b/components/esp_system/.build-test-rules.yml @@ -3,9 +3,15 @@ components/esp_system/host_test/esp_system: enable: - if: IDF_TARGET == "linux" + components/esp_system/test_apps/rtc_8md256: disable: - if: SOC_RTC_SLOW_CLK_SUPPORT_RC_FAST_D256 != 1 + disable_test: + - if: IDF_TARGET == "esp32c2" + temporary: true + reason: target esp32c2 is not supported yet IDF-5131 + components/esp_system/test_apps/rtc_power_modes: enable: - if: IDF_TARGET == "esp32s3" diff --git a/components/esp_system/test_apps/rtc_8md256/pytest_rtc_8md256.py b/components/esp_system/test_apps/rtc_8md256/pytest_rtc_8md256.py index 8410d9a5a5..badee8f269 100644 --- a/components/esp_system/test_apps/rtc_8md256/pytest_rtc_8md256.py +++ b/components/esp_system/test_apps/rtc_8md256/pytest_rtc_8md256.py @@ -48,7 +48,10 @@ def lightsleep_test(dut: Dut, case_name: str) -> None: dut.expect(r'Returned from light sleep, reason: timer', timeout=10) -@pytest.mark.supported_targets +@pytest.mark.esp32 +@pytest.mark.esp32s2 +@pytest.mark.esp32s3 +@pytest.mark.esp32c3 @pytest.mark.generic def test_rtc_8md256_lightsleep(dut: Dut) -> None: lightsleep_test(dut, '"Can use 8MD256 as RTC clock source in lightsleep"') diff --git a/components/esp_timer/test_apps/pytest_esp_timer_ut.py b/components/esp_timer/test_apps/pytest_esp_timer_ut.py index 4587730bdb..a6b0847658 100644 --- a/components/esp_timer/test_apps/pytest_esp_timer_ut.py +++ b/components/esp_timer/test_apps/pytest_esp_timer_ut.py @@ -5,8 +5,8 @@ import pytest from pytest_embedded import Dut CONFIGS = [ - pytest.param('general', marks=[pytest.mark.supported_targets]), - pytest.param('release', marks=[pytest.mark.supported_targets]), + pytest.param('general', marks=[pytest.mark.supported_targets, pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='c6 support TBD')]), + pytest.param('release', marks=[pytest.mark.supported_targets, pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='c6 support TBD')]), pytest.param('single_core', marks=[pytest.mark.esp32]), pytest.param('freertos_compliance', marks=[pytest.mark.esp32]), pytest.param('isr_dispatch_esp32', marks=[pytest.mark.esp32]), diff --git a/components/esp_wifi/test_apps/wifi_function/pytest_wifi_function.py b/components/esp_wifi/test_apps/wifi_function/pytest_wifi_function.py index aa9de10372..1814f7a21a 100644 --- a/components/esp_wifi/test_apps/wifi_function/pytest_wifi_function.py +++ b/components/esp_wifi/test_apps/wifi_function/pytest_wifi_function.py @@ -6,6 +6,7 @@ from pytest_embedded import Dut @pytest.mark.supported_targets +@pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='c6 support TBD') @pytest.mark.generic def test_wifi_unit_test(dut: Dut) -> None: dut.expect_exact('Press ENTER to see the list of tests') diff --git a/components/newlib/test_apps/pytest_newlib.py b/components/newlib/test_apps/pytest_newlib.py index 81a2f579b4..76b55367b8 100644 --- a/components/newlib/test_apps/pytest_newlib.py +++ b/components/newlib/test_apps/pytest_newlib.py @@ -6,6 +6,7 @@ from pytest_embedded import Dut @pytest.mark.supported_targets +@pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='c6 support TBD') @pytest.mark.generic def test_newlib(dut: Dut) -> None: dut.expect_unity_test_output() diff --git a/components/spi_flash/.build-test-rules.yml b/components/spi_flash/.build-test-rules.yml index a1d2f26e6b..75439ba8ab 100644 --- a/components/spi_flash/.build-test-rules.yml +++ b/components/spi_flash/.build-test-rules.yml @@ -8,7 +8,7 @@ components/spi_flash/test_apps/esp_flash: components/spi_flash/test_apps/flash_encryption: disable_test: - - if: IDF_TARGET in ["esp32c2", "esp32s2"] + - if: IDF_TARGET in ["esp32c2", "esp32s2", "esp32c6"] temporary: true reason: No runners # IDF-5634 diff --git a/components/spi_flash/test_apps/flash_mmap/pytest_mmap.py b/components/spi_flash/test_apps/flash_mmap/pytest_mmap.py index 53745d3332..7e72f45cc7 100644 --- a/components/spi_flash/test_apps/flash_mmap/pytest_mmap.py +++ b/components/spi_flash/test_apps/flash_mmap/pytest_mmap.py @@ -6,6 +6,7 @@ from pytest_embedded import Dut @pytest.mark.supported_targets +@pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='c6 support TBD') @pytest.mark.generic @pytest.mark.parametrize( 'config', diff --git a/examples/build_system/.build-test-rules.yml b/examples/build_system/.build-test-rules.yml index 6388351100..f0e9fd5623 100644 --- a/examples/build_system/.build-test-rules.yml +++ b/examples/build_system/.build-test-rules.yml @@ -2,7 +2,7 @@ examples/build_system/cmake/import_lib: disable_test: - - if: IDF_TARGET in ["esp32c2", "esp32c3", "esp32s2", "esp32s3"] + - if: IDF_TARGET in ["esp32c2", "esp32c3", "esp32s2", "esp32s3", "esp32c6"] temporary: true reason: lack of runners diff --git a/examples/peripherals/mcpwm/mcpwm_capture_hc_sr04/pytest_hc_sr04.py b/examples/peripherals/mcpwm/mcpwm_capture_hc_sr04/pytest_hc_sr04.py index 70ca04bc69..f87ab4b197 100644 --- a/examples/peripherals/mcpwm/mcpwm_capture_hc_sr04/pytest_hc_sr04.py +++ b/examples/peripherals/mcpwm/mcpwm_capture_hc_sr04/pytest_hc_sr04.py @@ -7,6 +7,7 @@ from pytest_embedded import Dut @pytest.mark.esp32 @pytest.mark.esp32s3 +@pytest.mark.esp32c6 @pytest.mark.generic def test_hc_sr04_example(dut: Dut) -> None: dut.expect_exact('example: Install capture timer') diff --git a/examples/peripherals/mcpwm/mcpwm_servo_control/pytest_servo_mg996r.py b/examples/peripherals/mcpwm/mcpwm_servo_control/pytest_servo_mg996r.py index d22aa363d5..fc33d1125f 100644 --- a/examples/peripherals/mcpwm/mcpwm_servo_control/pytest_servo_mg996r.py +++ b/examples/peripherals/mcpwm/mcpwm_servo_control/pytest_servo_mg996r.py @@ -7,6 +7,7 @@ from pytest_embedded import Dut @pytest.mark.esp32 @pytest.mark.esp32s3 +@pytest.mark.esp32c6 @pytest.mark.generic def test_servo_mg996r_example(dut: Dut) -> None: dut.expect_exact('example: Create timer and operator') diff --git a/examples/peripherals/mcpwm/mcpwm_sync/pytest_mcpwm_sync.py b/examples/peripherals/mcpwm/mcpwm_sync/pytest_mcpwm_sync.py index 3e130c6646..6bf09fa2c9 100644 --- a/examples/peripherals/mcpwm/mcpwm_sync/pytest_mcpwm_sync.py +++ b/examples/peripherals/mcpwm/mcpwm_sync/pytest_mcpwm_sync.py @@ -7,6 +7,7 @@ from pytest_embedded import Dut @pytest.mark.esp32 @pytest.mark.esp32s3 +@pytest.mark.esp32c6 @pytest.mark.generic @pytest.mark.parametrize('config', [ pytest.param('gpio', marks=[pytest.mark.esp32, pytest.mark.esp32s3]), diff --git a/examples/peripherals/rmt/dshot_esc/pytest_dshot_esc.py b/examples/peripherals/rmt/dshot_esc/pytest_dshot_esc.py index a5344b4637..3723f1d03b 100644 --- a/examples/peripherals/rmt/dshot_esc/pytest_dshot_esc.py +++ b/examples/peripherals/rmt/dshot_esc/pytest_dshot_esc.py @@ -9,6 +9,7 @@ from pytest_embedded import Dut @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.esp32c3 +@pytest.mark.esp32c6 @pytest.mark.generic def test_dshot_esc_example(dut: Dut) -> None: dut.expect_exact('example: Create RMT TX channel') diff --git a/examples/peripherals/rmt/led_strip/pytest_led_strip.py b/examples/peripherals/rmt/led_strip/pytest_led_strip.py index c3daa80356..45a36431a1 100644 --- a/examples/peripherals/rmt/led_strip/pytest_led_strip.py +++ b/examples/peripherals/rmt/led_strip/pytest_led_strip.py @@ -9,6 +9,7 @@ from pytest_embedded import Dut @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.esp32c3 +@pytest.mark.esp32c6 @pytest.mark.generic def test_led_strip_example(dut: Dut) -> None: dut.expect_exact('example: Create RMT TX channel') diff --git a/examples/peripherals/rmt/musical_buzzer/pytest_musical_buzzer.py b/examples/peripherals/rmt/musical_buzzer/pytest_musical_buzzer.py index 8386110c34..17d90991c4 100644 --- a/examples/peripherals/rmt/musical_buzzer/pytest_musical_buzzer.py +++ b/examples/peripherals/rmt/musical_buzzer/pytest_musical_buzzer.py @@ -8,6 +8,7 @@ from pytest_embedded import Dut @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.esp32c3 +@pytest.mark.esp32c6 # @pytest.mark.esp32h4 TODO: uncomment this when remove --preview for h4 @pytest.mark.generic def test_musical_buzzer_example(dut: Dut) -> None: diff --git a/examples/peripherals/rmt/onewire_ds18b20/pytest_onewire_ds18b20.py b/examples/peripherals/rmt/onewire_ds18b20/pytest_onewire_ds18b20.py index 4b189f3153..41cb8c3209 100644 --- a/examples/peripherals/rmt/onewire_ds18b20/pytest_onewire_ds18b20.py +++ b/examples/peripherals/rmt/onewire_ds18b20/pytest_onewire_ds18b20.py @@ -8,6 +8,7 @@ from pytest_embedded import Dut @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.esp32c3 +@pytest.mark.esp32c6 @pytest.mark.generic def test_onewire_ds18b20_example(dut: Dut) -> None: dut.expect_exact('onewire_rmt: RMT Tx channel created for 1-wire bus') diff --git a/examples/peripherals/rmt/stepper_motor/pytest_stepper_motor.py b/examples/peripherals/rmt/stepper_motor/pytest_stepper_motor.py index d290fb17b9..851563a3e2 100644 --- a/examples/peripherals/rmt/stepper_motor/pytest_stepper_motor.py +++ b/examples/peripherals/rmt/stepper_motor/pytest_stepper_motor.py @@ -6,6 +6,7 @@ from pytest_embedded import Dut @pytest.mark.esp32s3 +@pytest.mark.esp32c6 @pytest.mark.generic def test_ir_nec_example(dut: Dut) -> None: dut.expect_exact('example: Initialize EN + DIR GPIO') diff --git a/examples/peripherals/sigma_delta/pytest_sdm_example.py b/examples/peripherals/sigma_delta/pytest_sdm_example.py index cfe2fc9908..4a233013bc 100644 --- a/examples/peripherals/sigma_delta/pytest_sdm_example.py +++ b/examples/peripherals/sigma_delta/pytest_sdm_example.py @@ -9,6 +9,7 @@ from pytest_embedded import Dut @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.esp32c3 +@pytest.mark.esp32c6 @pytest.mark.generic def test_sdm_example(dut: Dut) -> None: dut.expect_exact('example: Install sigma delta channel') diff --git a/examples/peripherals/temp_sensor/pytest_temp_sensor_example.py b/examples/peripherals/temp_sensor/pytest_temp_sensor_example.py index 161f508c50..3bc5992169 100644 --- a/examples/peripherals/temp_sensor/pytest_temp_sensor_example.py +++ b/examples/peripherals/temp_sensor/pytest_temp_sensor_example.py @@ -9,6 +9,7 @@ from pytest_embedded.dut import Dut @pytest.mark.esp32c3 @pytest.mark.esp32s3 @pytest.mark.esp32c2 +@pytest.mark.esp32c6 @pytest.mark.generic def test_temp_sensor_example(dut: Dut) -> None: dut.expect_exact('Install temperature sensor') diff --git a/examples/protocols/esp_http_client/pytest_esp_http_client.py b/examples/protocols/esp_http_client/pytest_esp_http_client.py index c61d41f20f..d87bb07da6 100644 --- a/examples/protocols/esp_http_client/pytest_esp_http_client.py +++ b/examples/protocols/esp_http_client/pytest_esp_http_client.py @@ -57,7 +57,15 @@ def test_examples_protocol_esp_http_client(dut: Dut) -> None: dut.expect('Finish http example') -@pytest.mark.parametrize('config', [pytest.param('ssldyn', marks=[pytest.mark.supported_targets, pytest.mark.ethernet]),], indirect=True) +@pytest.mark.parametrize( + 'config', + [ + pytest.param('ssldyn', marks=[pytest.mark.supported_targets, + pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='c6 support TBD'), + pytest.mark.ethernet]), + ], + indirect=True +) def test_examples_protocol_esp_http_client_dynamic_buffer(dut: Dut) -> None: # test mbedtls dynamic resource # check and log bin size diff --git a/examples/protocols/esp_local_ctrl/pytest_esp_local_ctrl.py b/examples/protocols/esp_local_ctrl/pytest_esp_local_ctrl.py index 40c3dbca4e..17819348c2 100644 --- a/examples/protocols/esp_local_ctrl/pytest_esp_local_ctrl.py +++ b/examples/protocols/esp_local_ctrl/pytest_esp_local_ctrl.py @@ -40,6 +40,7 @@ class CustomProcess(object): @pytest.mark.supported_targets +@pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='c6 support TBD') @pytest.mark.wifi_router def test_examples_esp_local_ctrl(dut: Dut) -> None: diff --git a/examples/protocols/https_request/pytest_https_request.py b/examples/protocols/https_request/pytest_https_request.py index 176ea0de2b..7d3406d51a 100644 --- a/examples/protocols/https_request/pytest_https_request.py +++ b/examples/protocols/https_request/pytest_https_request.py @@ -154,6 +154,7 @@ def test_examples_protocol_https_request_dynamic_buffers(dut: Dut) -> None: @pytest.mark.supported_targets +@pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='c6 support TBD') @pytest.mark.ethernet @pytest.mark.parametrize('erase_nvs', ['y'], indirect=True) def test_examples_protocol_https_request(dut: Dut) -> None: diff --git a/examples/security/.build-test-rules.yml b/examples/security/.build-test-rules.yml index de87020fcf..3bd4346270 100644 --- a/examples/security/.build-test-rules.yml +++ b/examples/security/.build-test-rules.yml @@ -6,6 +6,6 @@ examples/security/flash_encryption: temporary: true reason: target esp32c2 is not supported yet disable_test: - - if: IDF_TARGET in ["esp32s2", "esp32s3"] + - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6"] temporary: true reason: lack of runners diff --git a/examples/storage/.build-test-rules.yml b/examples/storage/.build-test-rules.yml index 745a6443b6..010ce906c4 100644 --- a/examples/storage/.build-test-rules.yml +++ b/examples/storage/.build-test-rules.yml @@ -22,7 +22,7 @@ examples/storage/fatfsgen: temporary: true reason: target esp32c2 is not supported yet disable_test: - - if: IDF_TARGET in ["esp32c3", "esp32s2", "esp32s3"] + - if: IDF_TARGET in ["esp32c3", "esp32s2", "esp32s3", "esp32c6"] temporary: true reason: lack of runners @@ -32,7 +32,7 @@ examples/storage/nvs_rw_blob: temporary: true reason: target esp32c2 is not supported yet disable_test: - - if: IDF_TARGET in ["esp32s2", "esp32s3"] + - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6"] temporary: true reason: lack of runners @@ -42,7 +42,7 @@ examples/storage/nvs_rw_value: temporary: true reason: target esp32c2 is not supported yet disable_test: - - if: IDF_TARGET in ["esp32s2", "esp32s3"] + - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6"] temporary: true reason: lack of runners @@ -52,7 +52,7 @@ examples/storage/nvs_rw_value_cxx: temporary: true reason: target esp32c2 is not supported yet disable_test: - - if: IDF_TARGET in ["esp32s2", "esp32s3"] + - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6"] temporary: true reason: lack of runners @@ -62,7 +62,7 @@ examples/storage/partition_api/partition_find: temporary: true reason: target esp32c2 is not supported yet disable_test: - - if: IDF_TARGET in ["esp32s2", "esp32s3"] + - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6"] temporary: true reason: lack of runners @@ -72,7 +72,7 @@ examples/storage/partition_api/partition_mmap: temporary: true reason: target esp32c2 is not supported yet disable_test: - - if: IDF_TARGET in ["esp32s2", "esp32s3"] + - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6"] temporary: true reason: lack of runners @@ -82,7 +82,7 @@ examples/storage/partition_api/partition_ops: temporary: true reason: target esp32c2 is not supported yet disable_test: - - if: IDF_TARGET in ["esp32s2", "esp32s3"] + - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6"] temporary: true reason: lack of runners @@ -92,7 +92,7 @@ examples/storage/parttool: temporary: true reason: target esp32c2 is not supported yet disable_test: - - if: IDF_TARGET in ["esp32s2", "esp32s3"] + - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6"] temporary: true reason: lack of runners @@ -120,7 +120,7 @@ examples/storage/semihost_vfs: temporary: true reason: target esp32c2 is not supported yet disable_test: - - if: IDF_TARGET in ["esp32c3", "esp32s2", "esp32s3"] + - if: IDF_TARGET in ["esp32c3", "esp32s2", "esp32s3", "esp32c6"] temporary: true reason: lack of runners @@ -130,7 +130,7 @@ examples/storage/spiffs: temporary: true reason: target esp32c2 is not supported yet disable_test: - - if: IDF_TARGET in ["esp32s2", "esp32s3"] + - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6"] temporary: true reason: lack of runners @@ -140,7 +140,7 @@ examples/storage/spiffsgen: temporary: true reason: target esp32c2 is not supported yet disable_test: - - if: IDF_TARGET in ["esp32s2", "esp32s3"] + - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6"] temporary: true reason: lack of runners @@ -150,6 +150,6 @@ examples/storage/wear_levelling: temporary: true reason: target esp32c2 is not supported yet disable_test: - - if: IDF_TARGET in ["esp32s2", "esp32s3"] + - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6"] temporary: true reason: lack of runners diff --git a/examples/system/.build-test-rules.yml b/examples/system/.build-test-rules.yml index e7e1a87e03..69f3404c23 100644 --- a/examples/system/.build-test-rules.yml +++ b/examples/system/.build-test-rules.yml @@ -47,6 +47,9 @@ examples/system/efuse: - if: IDF_TARGET == "esp32s3" temporary: true reason: lack of runners + - if: IDF_TARGET == "esp32c6" + temporary: true + reason: target esp32c6 is not supported yet examples/system/esp_timer: disable: @@ -174,7 +177,7 @@ examples/system/task_watchdog: disable_test: - if: IDF_TARGET == "esp32c2" temporary: true - reason: lack of runners + reason: target esp32c2 is not supported yet examples/system/ulp_fsm/ulp: disable: diff --git a/examples/system/eventfd/pytest_eventfd.py b/examples/system/eventfd/pytest_eventfd.py index 093879a19f..55d88a08c9 100644 --- a/examples/system/eventfd/pytest_eventfd.py +++ b/examples/system/eventfd/pytest_eventfd.py @@ -13,6 +13,7 @@ from pytest_embedded import Dut @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.esp32c3 +@pytest.mark.esp32c6 @pytest.mark.generic def test_eventfd(dut: Dut) -> None: diff --git a/examples/system/ota/native_ota_example/pytest_native_ota.py b/examples/system/ota/native_ota_example/pytest_native_ota.py index d590174f4d..169173934a 100644 --- a/examples/system/ota/native_ota_example/pytest_native_ota.py +++ b/examples/system/ota/native_ota_example/pytest_native_ota.py @@ -122,6 +122,7 @@ def start_chunked_server(ota_image_dir: str, server_port: int) -> subprocess.Pop @pytest.mark.supported_targets +@pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='c6 support TBD') @pytest.mark.ethernet_ota def test_examples_protocol_native_ota_example(dut: Dut) -> None: """ @@ -161,6 +162,7 @@ def test_examples_protocol_native_ota_example(dut: Dut) -> None: @pytest.mark.supported_targets +@pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='c6 support TBD') @pytest.mark.ethernet_ota def test_examples_protocol_native_ota_example_truncated_bin(dut: Dut) -> None: """ @@ -211,6 +213,7 @@ def test_examples_protocol_native_ota_example_truncated_bin(dut: Dut) -> None: @pytest.mark.supported_targets +@pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='c6 support TBD') @pytest.mark.ethernet_ota def test_examples_protocol_native_ota_example_truncated_header(dut: Dut) -> None: """ @@ -260,6 +263,7 @@ def test_examples_protocol_native_ota_example_truncated_header(dut: Dut) -> None @pytest.mark.supported_targets +@pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='c6 support TBD') @pytest.mark.ethernet_ota def test_examples_protocol_native_ota_example_random(dut: Dut) -> None: """ @@ -309,6 +313,7 @@ def test_examples_protocol_native_ota_example_random(dut: Dut) -> None: @pytest.mark.supported_targets +@pytest.mark.temp_skip_ci(targets=['esp32c6'], reason='c6 support TBD') @pytest.mark.ethernet_ota def test_examples_protocol_native_ota_example_chunked(dut: Dut) -> None: """ diff --git a/examples/system/ota/otatool/pytest_otatool.py b/examples/system/ota/otatool/pytest_otatool.py index 555c38312e..da5ef502fa 100644 --- a/examples/system/ota/otatool/pytest_otatool.py +++ b/examples/system/ota/otatool/pytest_otatool.py @@ -14,6 +14,7 @@ from pytest_embedded import Dut @pytest.mark.esp32s2 @pytest.mark.esp32c3 @pytest.mark.esp32s3 +@pytest.mark.esp32c6 @pytest.mark.generic def test_otatool_example(dut: Dut) -> None: # Verify factory firmware diff --git a/examples/system/select/pytest_select.py b/examples/system/select/pytest_select.py index c09a176db1..c5b2255a5e 100644 --- a/examples/system/select/pytest_select.py +++ b/examples/system/select/pytest_select.py @@ -22,6 +22,7 @@ def get_uart_msgs(i: int) -> List[str]: @pytest.mark.esp32 @pytest.mark.esp32c3 +@pytest.mark.esp32c6 @pytest.mark.generic def test_examples_select(dut: Dut) -> None: diff --git a/examples/system/task_watchdog/pytest_task_watchdog.py b/examples/system/task_watchdog/pytest_task_watchdog.py index 77d2aca393..a25ada616f 100644 --- a/examples/system/task_watchdog/pytest_task_watchdog.py +++ b/examples/system/task_watchdog/pytest_task_watchdog.py @@ -10,6 +10,7 @@ from pytest_embedded import Dut @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.esp32c3 +@pytest.mark.esp32c6 @pytest.mark.generic def test_task_watchdog(dut: Dut) -> None: