Skip to content

Commit dfc248d

Browse files
committed
change(tools): enhance expect_reg_dump to support any or specific core values
1 parent ef14d7a commit dfc248d

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

tools/test_apps/system/panic/pytest_panic.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,11 +1066,11 @@ def test_tcb_corrupted(dut: PanicTestDut, target: str, config: str, test_func_na
10661066
dut.run_test_func(test_func_name)
10671067
if dut.is_xtensa:
10681068
dut.expect_gme('LoadProhibited')
1069-
dut.expect_reg_dump(0)
1069+
dut.expect_reg_dump()
10701070
dut.expect_backtrace()
10711071
else:
10721072
dut.expect_gme('Load access fault')
1073-
dut.expect_reg_dump(0)
1073+
dut.expect_reg_dump()
10741074
dut.expect_stack_dump()
10751075

10761076
dut.expect_elf_sha256()

tools/test_apps/system/panic/test_panic_util/panic_dut.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,13 @@ def expect_gme(self, reason: str) -> None:
9696
"""Expect method for Guru Meditation Errors"""
9797
self.expect_exact(f"Guru Meditation Error: Core 0 panic'ed ({reason})")
9898

99-
def expect_reg_dump(self, core: int = 0) -> None:
100-
"""Expect method for the register dump"""
101-
self.expect(r'Core\s+%d register dump:' % core)
99+
def expect_reg_dump(self, core: Optional[int] = None) -> None:
100+
if core is None:
101+
# Match any core num
102+
self.expect(r'Core\s+\d+\s+register dump:')
103+
else:
104+
# Match the exact core num provided
105+
self.expect(r'Core\s+%d\s+register dump:' % core)
102106

103107
def expect_cpu_reset(self) -> None:
104108
# no digital system reset for panic handling restarts (see IDF-7255)

0 commit comments

Comments
 (0)