Skip to content

Commit ceec472

Browse files
committed
enable back the test apps for s2 only on 5.3, launch the pytest from root dir with target path
1 parent 60b0ad1 commit ceec472

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

.github/workflows/build_and_run_esp_usb_test_apps.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
# idf_ver: ["release-v5.1", "release-v5.2", "release-v5.3", "release-v5.4", "release-v5.5", "latest"]
18-
idf_ver: ["latest"]
18+
# idf_ver: ["latest"]
19+
idf_ver: ["release-v5.3"]
1920
runs-on: ubuntu-latest
2021
container: espressif/idf:${{ matrix.idf_ver }}
2122
env:
@@ -42,8 +43,8 @@ jobs:
4243
export EXTRA_CFLAGS="${PEDANTIC_FLAGS} -Wstrict-prototypes"
4344
export EXTRA_CXXFLAGS="${PEDANTIC_FLAGS}"
4445
python .github/ci/override_managed_component.py tinyusb . ${{ env.ESP_TINYUSB_TEST_APPS }}/*/
45-
idf-build-apps find --config-file ${{ env.ESP_USB_CONFIG_FILE }} -p ${{ env.ESP_TINYUSB_TEST_APPS }} --recursive -t all --manifest-files ${{ env.ESP_USB_MANIFEST }} --manifest-rootpath ${{ env.ESP_USB_PATH }}
46-
# idf-build-apps build --config-file ${{ env.ESP_USB_CONFIG_FILE }} -p ${{ env.ESP_TINYUSB_TEST_APPS }} --recursive -t all --manifest-files ${{ env.ESP_USB_MANIFEST }} --manifest-rootpath ${{ env.ESP_USB_PATH }}
46+
idf-build-apps find --config-file ${{ env.ESP_USB_CONFIG_FILE }} -p ${{ env.ESP_TINYUSB_TEST_APPS }} --recursive -t esp32s2 --manifest-files ${{ env.ESP_USB_MANIFEST }} --manifest-rootpath ${{ env.ESP_USB_PATH }}
47+
idf-build-apps build --config-file ${{ env.ESP_USB_CONFIG_FILE }} -p ${{ env.ESP_TINYUSB_TEST_APPS }} --recursive -t esp32s2 --manifest-files ${{ env.ESP_USB_MANIFEST }} --manifest-rootpath ${{ env.ESP_USB_PATH }}
4748
- uses: actions/upload-artifact@v4
4849
with:
4950
name: usb_device_test_app_bin_${{ matrix.idf_ver }}
@@ -65,7 +66,8 @@ jobs:
6566
fail-fast: false
6667
matrix:
6768
# idf_ver: ["release-v5.1", "release-v5.2", "release-v5.3", "release-v5.4", "release-v5.5", "latest"]
68-
idf_ver: ["latest"]
69+
# idf_ver: ["latest"]
70+
idf_ver: ["release-v5.3"]
6971
idf_target: ["esp32s2"]
7072
sdkconfig: ["default"]
7173
runner_tag: ["usb_device"]
@@ -96,6 +98,4 @@ jobs:
9698
# and the build artifacts already have the correct folder structure.
9799
name: usb_device_test_app_bin_${{ matrix.idf_ver }}
98100
- name: Run on target
99-
run: |
100-
cd ${{ env.ESP_USB_ROOT }}
101-
pytest --target=${{ matrix.idf_target }} -m ${{ matrix.runner_tag }} --build-dir=build_${{ matrix.idf_target }}_${{ matrix.sdkconfig }}
101+
run: pytest ${{ env.ESP_USB_TEST_APPS_PATH }} --target=${{ matrix.idf_target }} -m ${{ matrix.runner_tag }} --build-dir=build_${{ matrix.idf_target }}_${{ matrix.sdkconfig }}

.github/workflows/build_and_run_idf_examples.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
env:
4747
IDF_ROOT: "/opt/esp/idf"
4848
with:
49-
# We upload only the USB Device example binaries to run them on the target
49+
# We upload only USB Device example binaries to run them on the target
5050
name: usb_device_examples_bin_${{ matrix.idf_ver }}
5151
path: |
5252
${{ env.IDF_ROOT }}/**/build_esp*/bootloader/bootloader.bin
@@ -98,5 +98,4 @@ jobs:
9898
- name: Run on target
9999
run: |
100100
. ${IDF_PATH}/export.sh
101-
export EXAMPLES_PATH="${IDF_PATH}/examples/peripherals/usb/device"
102-
pytest ${EXAMPLES_PATH} --target ${{ matrix.idf_target }} -m ${{ matrix.runner_tag }} --ignore-result-cases=*ncm_example --build-dir=build_${{ matrix.idf_target }}
101+
pytest ${{ env.IDF_EXAMPLES_PATH }} --target ${{ matrix.idf_target }} -m ${{ matrix.runner_tag }} --ignore-result-cases=*ncm_example --build-dir=build_${{ matrix.idf_target }}

0 commit comments

Comments
 (0)