Skip to content

Commit afc3741

Browse files
committed
Merge branch 'ci/reenable_p4_usb_device_tests_backport_v5.5' into 'release/v5.5'
ci(usb/device): re-enable usb_device tests for ESP32-P4 (backport v5.5) See merge request espressif/esp-idf!43771
2 parents ef9b619 + 6eb5def commit afc3741

File tree

7 files changed

+10
-20
lines changed

7 files changed

+10
-20
lines changed

examples/peripherals/.build-test-rules.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -550,12 +550,13 @@ examples/peripherals/usb/device:
550550
disable:
551551
- if: SOC_USB_OTG_SUPPORTED != 1
552552
disable_test:
553-
- if: IDF_TARGET not in ["esp32s2"]
553+
- if: IDF_TARGET not in ["esp32s2", "esp32p4"]
554554
temporary: true
555-
reason: lack of runners with usb_device tag # TODO: IDF-14369
555+
reason: lack of runners with usb_device tag
556556
depends_components:
557557
- usb
558558
- fatfs
559+
- esp_hw_support # for usb_phy
559560
depends_filepatterns:
560561
- examples/peripherals/usb/device/**/*
561562

@@ -582,6 +583,7 @@ examples/peripherals/usb/host:
582583
depends_components:
583584
- usb
584585
- fatfs
586+
- esp_hw_support # for usb_phy
585587
depends_filepatterns:
586588
- components/hal/usb*.c
587589
- components/hal/include/hal/usb*.h

examples/peripherals/usb/device/tusb_composite_msc_serialdevice/pytest_usb_device_composite.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
from serial.tools.list_ports import comports
1010

1111

12-
@pytest.mark.temp_skip_ci(
13-
targets=['esp32s3', 'esp32p4'], reason='lack of runners with usb_device tag, p4 rev3 migration # TODO: IDF-14369'
14-
)
12+
@pytest.mark.temp_skip_ci(targets=['esp32s3'], reason='lack of runners with usb_device tag')
1513
@pytest.mark.usb_device
1614
@idf_parametrize('target', ['esp32s2', 'esp32s3', 'esp32p4'], indirect=['target'])
1715
def test_usb_composite_device_serial_example(dut: Dut) -> None:

examples/peripherals/usb/device/tusb_console/pytest_usb_device_console.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
from serial.tools.list_ports import comports
1010

1111

12-
@pytest.mark.temp_skip_ci(
13-
targets=['esp32s3', 'esp32p4'], reason='lack of runners with usb_device tag, p4 rev3 migration # TODO: IDF-14369'
14-
)
12+
@pytest.mark.temp_skip_ci(targets=['esp32s3'], reason='lack of runners with usb_device tag')
1513
@pytest.mark.usb_device
1614
@idf_parametrize('target', ['esp32s2', 'esp32s3', 'esp32p4'], indirect=['target'])
1715
def test_usb_device_console_example(dut: Dut) -> None:

examples/peripherals/usb/device/tusb_hid/pytest_usb_device_hid.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
from pytest_embedded_idf.utils import idf_parametrize
66

77

8-
@pytest.mark.temp_skip_ci(
9-
targets=['esp32s3', 'esp32p4'], reason='lack of runners with usb_device tag, p4 rev3 migration # TODO: IDF-14369'
10-
)
8+
@pytest.mark.temp_skip_ci(targets=['esp32s3'], reason='lack of runners with usb_device tag')
119
@pytest.mark.usb_device
1210
@idf_parametrize('target', ['esp32s2', 'esp32s3', 'esp32p4'], indirect=['target'])
1311
def test_usb_device_hid_example(dut: Dut) -> None:

examples/peripherals/usb/device/tusb_midi/pytest_usb_device_midi.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
from pytest_embedded_idf.utils import idf_parametrize
66

77

8-
@pytest.mark.temp_skip_ci(
9-
targets=['esp32s3', 'esp32p4'], reason='lack of runners with usb_device tag, p4 rev3 migration # TODO: IDF-14369'
10-
)
8+
@pytest.mark.temp_skip_ci(targets=['esp32s3'], reason='lack of runners with usb_device tag')
119
@pytest.mark.usb_device
1210
@idf_parametrize('target', ['esp32s2', 'esp32s3', 'esp32p4'], indirect=['target'])
1311
def test_usb_device_midi_example(dut: Dut) -> None:

examples/peripherals/usb/device/tusb_msc/pytest_usb_device_msc.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
from pytest_embedded_idf.utils import idf_parametrize
66

77

8-
@pytest.mark.temp_skip_ci(
9-
targets=['esp32s3', 'esp32p4'], reason='lack of runners with usb_device tag, p4 rev3 migration # TODO: IDF-14369'
10-
)
8+
@pytest.mark.temp_skip_ci(targets=['esp32s3'], reason='lack of runners with usb_device tag')
119
@pytest.mark.usb_device
1210
@idf_parametrize('target', ['esp32s2', 'esp32s3', 'esp32p4'], indirect=['target'])
1311
def test_usb_device_msc_example(dut: Dut) -> None:

examples/peripherals/usb/device/tusb_serial_device/pytest_usb_device_serial.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
from serial.tools.list_ports import comports
1010

1111

12-
@pytest.mark.temp_skip_ci(
13-
targets=['esp32s3', 'esp32p4'], reason='lack of runners with usb_device tag, p4 rev3 migration # TODO: IDF-14369'
14-
)
12+
@pytest.mark.temp_skip_ci(targets=['esp32s3'], reason='lack of runners with usb_device tag')
1513
@pytest.mark.usb_device
1614
@idf_parametrize('target', ['esp32s2', 'esp32s3', 'esp32p4'], indirect=['target'])
1715
def test_usb_device_serial_example(dut: Dut) -> None:

0 commit comments

Comments
 (0)