Skip to content

Commit 7097303

Browse files
committed
panic: fix checks for corrupted backtrace in the test cases
"CORRUPTED" needs to be checked before ELF SHA256. Use expect_backtrace in every test (which checks for it), remove extra check for CORRUPTED.
1 parent 5ff9cd4 commit 7097303

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

tools/test_apps/system/panic/panic_tests.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,22 @@ def task_wdt_inner(env, test_name):
1919
dut.expect("CPU 0: main")
2020
dut.expect(re.compile(r"abort\(\) was called at PC [0-9xa-f]+ on core 0"))
2121
dut.expect_none("register dump:")
22-
dut.expect("Backtrace:")
22+
dut.expect_backtrace()
2323
dut.expect_elf_sha256()
24-
dut.expect_none("CORRUPTED", "Guru Meditation")
24+
dut.expect_none("Guru Meditation")
2525
test_common(dut, test_name)
2626

2727

2828
def int_wdt_inner(env, test_name):
2929
with get_dut(env, test_name, "test_int_wdt", qemu_wdt_enable=True) as dut:
3030
dut.expect_gme("Interrupt wdt timeout on CPU0")
3131
dut.expect_reg_dump(0)
32-
dut.expect("Backtrace:")
33-
dut.expect_none("CORRUPTED", "Guru Meditation")
32+
dut.expect_backtrace()
33+
dut.expect_none("Guru Meditation")
3434
dut.expect_reg_dump(1)
35-
dut.expect("Backtrace:")
35+
dut.expect_backtrace()
3636
dut.expect_elf_sha256()
37-
dut.expect_none("CORRUPTED", "Guru Meditation")
37+
dut.expect_none("Guru Meditation")
3838
test_common(dut, test_name)
3939

4040

@@ -44,11 +44,11 @@ def int_wdt_cache_disabled_inner(env, test_name):
4444
dut.expect_gme("Interrupt wdt timeout on CPU0")
4545
dut.expect_reg_dump(0)
4646
dut.expect("Backtrace:")
47-
dut.expect_none("CORRUPTED", "Guru Meditation")
47+
dut.expect_none("Guru Meditation")
4848
dut.expect_reg_dump(1)
49-
dut.expect("Backtrace:")
49+
dut.expect_backtrace()
5050
dut.expect_elf_sha256()
51-
dut.expect_none("CORRUPTED", "Guru Meditation")
51+
dut.expect_none("Guru Meditation")
5252
test_common(dut, test_name)
5353

5454

@@ -57,28 +57,28 @@ def cache_error_inner(env, test_name):
5757
dut.expect("Re-enable cpu cache.")
5858
dut.expect_gme("Cache disabled but cached memory region accessed")
5959
dut.expect_reg_dump(0)
60-
dut.expect("Backtrace:")
60+
dut.expect_backtrace()
6161
dut.expect_elf_sha256()
62-
dut.expect_none("CORRUPTED", "Guru Meditation")
62+
dut.expect_none("Guru Meditation")
6363
test_common(dut, test_name)
6464

6565

6666
def abort_inner(env, test_name):
6767
with get_dut(env, test_name, "test_abort") as dut:
6868
dut.expect(re.compile(r"abort\(\) was called at PC [0-9xa-f]+ on core 0"))
69-
dut.expect("Backtrace:")
69+
dut.expect_backtrace()
7070
dut.expect_elf_sha256()
71-
dut.expect_none("CORRUPTED", "Guru Meditation", "Re-entered core dump")
71+
dut.expect_none("Guru Meditation", "Re-entered core dump")
7272
test_common(dut, test_name)
7373

7474

7575
def storeprohibited_inner(env, test_name):
7676
with get_dut(env, test_name, "test_storeprohibited") as dut:
7777
dut.expect_gme("StoreProhibited")
7878
dut.expect_reg_dump(0)
79-
dut.expect("Backtrace:")
79+
dut.expect_backtrace()
8080
dut.expect_elf_sha256()
81-
dut.expect_none("CORRUPTED", "Guru Meditation")
81+
dut.expect_none("Guru Meditation")
8282
test_common(dut, test_name)
8383

8484

@@ -87,19 +87,19 @@ def stack_overflow_inner(env, test_name):
8787
dut.expect_gme("Unhandled debug exception")
8888
dut.expect("Stack canary watchpoint triggered (main)")
8989
dut.expect_reg_dump(0)
90-
dut.expect("Backtrace:")
90+
dut.expect_backtrace()
9191
dut.expect_elf_sha256()
92-
dut.expect_none("CORRUPTED", "Guru Meditation")
92+
dut.expect_none("Guru Meditation")
9393
test_common(dut, test_name)
9494

9595

9696
def illegal_instruction_inner(env, test_name):
9797
with get_dut(env, test_name, "test_illegal_instruction") as dut:
9898
dut.expect_gme("IllegalInstruction")
9999
dut.expect_reg_dump(0)
100-
dut.expect("Backtrace:")
100+
dut.expect_backtrace()
101101
dut.expect_elf_sha256()
102-
dut.expect_none("CORRUPTED", "Guru Meditation")
102+
dut.expect_none("Guru Meditation")
103103
test_common(dut, test_name)
104104

105105

@@ -109,5 +109,5 @@ def instr_fetch_prohibited_inner(env, test_name):
109109
dut.expect_reg_dump(0)
110110
dut.expect_backtrace()
111111
dut.expect_elf_sha256()
112-
dut.expect_none("CORRUPTED", "Guru Meditation")
112+
dut.expect_none("Guru Meditation")
113113
test_common(dut, test_name)

0 commit comments

Comments
 (0)