diff --git a/tools/test_apps/system/panic/pytest_panic.py b/tools/test_apps/system/panic/pytest_panic.py index f73d0f813a8..b51832880e9 100644 --- a/tools/test_apps/system/panic/pytest_panic.py +++ b/tools/test_apps/system/panic/pytest_panic.py @@ -1175,16 +1175,13 @@ def test_non_cache_drom_reg_execute_violation(dut: PanicTestDut, test_func_name: def spiram_xip_irom_alignment_reg_execute_violation(dut: PanicTestDut, test_func_name: str) -> None: dut.run_test_func(test_func_name) - try: - dut.expect_gme('Instruction access fault') - except Exception: - dut.expect_exact('SPIRAM (IROM): IROM alignment gap not added into heap') - dut.expect_reg_dump(0) + match = dut.expect(r'(IROM alignment gap not added into heap|Instruction access fault)') + if match.group(1) == b'Instruction access fault': + dut.expect_reg_dump(0) dut.expect_cpu_reset() @pytest.mark.generic -@pytest.mark.temp_skip_ci(targets=['esp32c5'], reason='TODO IDF-14835') @idf_parametrize('config, target', CONFIGS_MEMPROT_SPIRAM_XIP_IROM_ALIGNMENT_HEAP, indirect=['config', 'target']) def test_spiram_xip_irom_alignment_reg_execute_violation(dut: PanicTestDut, test_func_name: str) -> None: spiram_xip_irom_alignment_reg_execute_violation(dut, test_func_name) @@ -1201,19 +1198,14 @@ def test_non_cache_spiram_xip_irom_alignment_reg_execute_violation(dut: PanicTes def spiram_xip_drom_alignment_reg_execute_violation(dut: PanicTestDut, test_func_name: str) -> None: dut.run_test_func(test_func_name) - try: - if dut.target == 'esp32s3': - dut.expect_gme('InstructionFetchError') - else: - dut.expect_gme('Instruction access fault') - except Exception: - dut.expect_exact('SPIRAM (DROM): DROM alignment gap not added into heap') - dut.expect_reg_dump(0) + fault_reason = 'InstructionFetchError' if dut.target == 'esp32s3' else 'Instruction access fault' + match = dut.expect(rf'(DROM alignment gap not added into heap|{fault_reason})') + if match.group(1) != b'DROM alignment gap not added into heap': + dut.expect_reg_dump(0) dut.expect_cpu_reset() @pytest.mark.generic -@pytest.mark.temp_skip_ci(targets=['esp32c5'], reason='TODO IDF-14835') @idf_parametrize('config, target', CONFIGS_MEMPROT_SPIRAM_XIP_DROM_ALIGNMENT_HEAP, indirect=['config', 'target']) def test_spiram_xip_drom_alignment_reg_execute_violation(dut: PanicTestDut, test_func_name: str) -> None: spiram_xip_drom_alignment_reg_execute_violation(dut, test_func_name)