ci: move log dir from pytest_embedded_log to pytest-embedded

This commit is contained in:
Fu Hanxi 2024-05-09 10:32:52 +02:00
parent 899fc7cd4f
commit 120a15b83f
5 changed files with 11 additions and 8 deletions

2
.gitignore vendored
View File

@ -100,6 +100,8 @@ dependencies.lock
managed_components managed_components
# pytest log # pytest log
pytest-embedded/
# legacy one
pytest_embedded_log/ pytest_embedded_log/
list_job_*.txt list_job_*.txt
size_info.txt size_info.txt

View File

@ -291,7 +291,7 @@ test_pytest_qemu:
when: always when: always
paths: paths:
- XUNIT_RESULT.xml - XUNIT_RESULT.xml
- pytest_embedded_log/ - pytest-embedded/
reports: reports:
junit: XUNIT_RESULT.xml junit: XUNIT_RESULT.xml
expire_in: 1 week expire_in: 1 week
@ -324,7 +324,7 @@ test_pytest_linux:
when: always when: always
paths: paths:
- XUNIT_RESULT.xml - XUNIT_RESULT.xml
- pytest_embedded_log/ - pytest-embedded/
- "**/build*/build_log.txt" - "**/build*/build_log.txt"
reports: reports:
junit: XUNIT_RESULT.xml junit: XUNIT_RESULT.xml

View File

@ -21,7 +21,7 @@
when: always when: always
paths: paths:
- XUNIT_RESULT.xml - XUNIT_RESULT.xml
- pytest_embedded_log/ - pytest-embedded/
reports: reports:
junit: XUNIT_RESULT.xml junit: XUNIT_RESULT.xml
expire_in: 1 week expire_in: 1 week

View File

@ -12,6 +12,8 @@ addopts =
--skip-check-coredump y --skip-check-coredump y
--logfile-extension ".txt" --logfile-extension ".txt"
--check-duplicates y --check-duplicates y
--ignore-glob */managed_components/*
--ignore pytest-embedded
# ignore DeprecationWarning # ignore DeprecationWarning
filterwarnings = filterwarnings =

View File

@ -1,16 +1,15 @@
# SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD # SPDX-FileCopyrightText: 2020-2024 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# internal use only for CI # internal use only for CI
# some CI related util functions # some CI related util functions
import logging import logging
import os import os
import subprocess import subprocess
import sys import sys
from typing import Any, List from typing import Any
from typing import List
IDF_PATH = os.path.abspath(os.getenv('IDF_PATH', os.path.join(os.path.dirname(__file__), '..', '..'))) IDF_PATH: str = os.path.abspath(os.getenv('IDF_PATH', os.path.join(os.path.dirname(__file__), '..', '..')))
def get_submodule_dirs(full_path: bool = False) -> List[str]: def get_submodule_dirs(full_path: bool = False) -> List[str]: