change(tools): enhance expect_reg_dump to support any or specific core values

This commit is contained in:
Erhan Kurubas 2024-11-29 13:36:07 +01:00
parent ef14d7ab64
commit dfc248d66d
2 changed files with 9 additions and 5 deletions

View File

@ -1066,11 +1066,11 @@ def test_tcb_corrupted(dut: PanicTestDut, target: str, config: str, test_func_na
dut.run_test_func(test_func_name) dut.run_test_func(test_func_name)
if dut.is_xtensa: if dut.is_xtensa:
dut.expect_gme('LoadProhibited') dut.expect_gme('LoadProhibited')
dut.expect_reg_dump(0) dut.expect_reg_dump()
dut.expect_backtrace() dut.expect_backtrace()
else: else:
dut.expect_gme('Load access fault') dut.expect_gme('Load access fault')
dut.expect_reg_dump(0) dut.expect_reg_dump()
dut.expect_stack_dump() dut.expect_stack_dump()
dut.expect_elf_sha256() dut.expect_elf_sha256()

View File

@ -96,9 +96,13 @@ class PanicTestDut(IdfDut):
"""Expect method for Guru Meditation Errors""" """Expect method for Guru Meditation Errors"""
self.expect_exact(f"Guru Meditation Error: Core 0 panic'ed ({reason})") self.expect_exact(f"Guru Meditation Error: Core 0 panic'ed ({reason})")
def expect_reg_dump(self, core: int = 0) -> None: def expect_reg_dump(self, core: Optional[int] = None) -> None:
"""Expect method for the register dump""" if core is None:
self.expect(r'Core\s+%d register dump:' % core) # Match any core num
self.expect(r'Core\s+\d+\s+register dump:')
else:
# Match the exact core num provided
self.expect(r'Core\s+%d\s+register dump:' % core)
def expect_cpu_reset(self) -> None: def expect_cpu_reset(self) -> None:
# no digital system reset for panic handling restarts (see IDF-7255) # no digital system reset for panic handling restarts (see IDF-7255)