alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revert "ci: rename all the generic s3 tag to generic_s3_fixme"

Browse Source 
This reverts commit 9bb9b58b3b.
This commit is contained in:
Fu Hanxi 2022-04-18 11:00:38 +08:00
parent e4d85807ea
commit 877e98ae4b
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab/ci/target-test.yml
View File

@ -49,7 +49,7 @@ example_test_pytest_esp32s3_generic:
- build_pytest_examples_esp32s3 - build_pytest_examples_esp32s3
variables: variables:
TARGET: ESP32S3 TARGET: ESP32S3
ENV_MARKER: generic_s3_fixme ENV_MARKER: generic
example_test_pytest_esp32c3_generic: example_test_pytest_esp32c3_generic:
extends: extends:
@ -164,7 +164,7 @@ component_ut_pytest_esp32s3_generic:
- build_pytest_components_esp32s3 - build_pytest_components_esp32s3
variables: variables:
TARGET: ESP32S3 TARGET: ESP32S3
ENV_MARKER: generic_s3_fixme ENV_MARKER: generic
component_ut_pytest_esp32s3_octal_psram: component_ut_pytest_esp32s3_octal_psram:
extends: extends:
@ -221,7 +221,7 @@ test_app_test_pytest_esp32s3_generic:
- build_pytest_test_apps_esp32s3 - build_pytest_test_apps_esp32s3
variables: variables:
TARGET: ESP32S3 TARGET: ESP32S3
ENV_MARKER: generic_s3_fixme ENV_MARKER: generic
test_app_test_pytest_esp32c3_generic: test_app_test_pytest_esp32c3_generic:
extends: extends:

5
conftest.py
View File

@ -255,11 +255,6 @@ class IdfPytestEmbedded:
if 'all_targets' in item_marker_names(item): if 'all_targets' in item_marker_names(item):
for _target in [*SUPPORTED_TARGETS, *PREVIEW_TARGETS]: for _target in [*SUPPORTED_TARGETS, *PREVIEW_TARGETS]:
item.add_marker(_target) item.add_marker(_target)
# FIXME: temporarily modify the s3 runner tag "generic" to "s3_generic" due to the deep sleep bug
if 'generic' in item_marker_names(item) and 'esp32s3' in item_marker_names(
item
):
item.add_marker('generic_s3_fixme')
# filter all the test cases with "--target" # filter all the test cases with "--target"
if self.target: if self.target:

1
pytest.ini
View File

@ -25,7 +25,6 @@ markers =
# env markers # env markers
generic: tests should be run on generic runners generic: tests should be run on generic runners
generic_s3_fixme: temporary workaround s3 runner
flash_suspend: support flash suspend feature flash_suspend: support flash suspend feature
ip101: connected via wired 10/100M ethernet ip101: connected via wired 10/100M ethernet
lan8720: connected via LAN8720 ethernet transceiver lan8720: connected via LAN8720 ethernet transceiver