Merge branch 'fix/panic_test' into 'master'

fix: panic test

See merge request espressif/esp-idf!18239
This commit is contained in:
Fu Hanxi 2022-05-26 10:09:15 +08:00
commit 788ac3989b
4 changed files with 5 additions and 3 deletions

View File

@ -74,7 +74,7 @@ variables:
TEST_ENV_CONFIG_REPO: "https://gitlab-ci-token:${BOT_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/qa/ci-test-runner-configs.git"
CI_AUTO_TEST_SCRIPT_REPO_URL: "https://gitlab-ci-token:${BOT_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/qa/auto_test_script.git"
CI_AUTO_TEST_SCRIPT_REPO_BRANCH: "ci/v4.1"
PYTEST_EMBEDDED_VERSION: "0.7.0"
PYTEST_EMBEDDED_VERSION: "0.7.1"
# cache python dependencies
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"

View File

@ -22,7 +22,8 @@ def get_prefix_map_gdbinit_path(prog_path): # type: (str) -> Any
build_dir = os.path.abspath(os.path.dirname(prog_path))
desc_path = os.path.abspath(os.path.join(build_dir, 'project_description.json'))
if not os.path.isfile(desc_path):
raise ValueError(f'{desc_path} does not exist. Please build the app with "idf.py build"')
logging.warning('%s does not exist. Please build the app with "idf.py build"', desc_path)
return ''
with open(desc_path, 'r') as f:
project_desc = json.load(f)

View File

@ -8,6 +8,7 @@ addopts =
-s
--embedded-services esp,idf
--tb short
--skip-check-coredump y
# ignore DeprecationWarning
filterwarnings =

View File

@ -50,7 +50,7 @@ def common_test(dut: PanicTestDut, config: str, expected_backtrace: Optional[Lis
def test_task_wdt(dut: PanicTestDut, config: str, test_func_name: str) -> None:
dut.expect_test_func_name(test_func_name)
dut.expect_exact(
'Task watchdog got triggered. The following tasks did not reset the watchdog in time:'
'Task watchdog got triggered. The following tasks/users did not reset the watchdog in time:'
)
dut.expect_exact('CPU 0: main')
dut.expect(r'abort\(\) was called at PC [0-9xa-f]+ on core 0')