diff --git a/tools/test_apps/system/panic/panic_tests.py b/tools/test_apps/system/panic/panic_tests.py index c939f24ce5..6fb93f13b8 100644 --- a/tools/test_apps/system/panic/panic_tests.py +++ b/tools/test_apps/system/panic/panic_tests.py @@ -19,9 +19,9 @@ def task_wdt_inner(env, test_name): dut.expect("CPU 0: main") dut.expect(re.compile(r"abort\(\) was called at PC [0-9xa-f]+ on core 0")) dut.expect_none("register dump:") - dut.expect("Backtrace:") + dut.expect_backtrace() dut.expect_elf_sha256() - dut.expect_none("CORRUPTED", "Guru Meditation") + dut.expect_none("Guru Meditation") test_common(dut, test_name) @@ -29,12 +29,12 @@ def int_wdt_inner(env, test_name): with get_dut(env, test_name, "test_int_wdt", qemu_wdt_enable=True) as dut: dut.expect_gme("Interrupt wdt timeout on CPU0") dut.expect_reg_dump(0) - dut.expect("Backtrace:") - dut.expect_none("CORRUPTED", "Guru Meditation") + dut.expect_backtrace() + dut.expect_none("Guru Meditation") dut.expect_reg_dump(1) - dut.expect("Backtrace:") + dut.expect_backtrace() dut.expect_elf_sha256() - dut.expect_none("CORRUPTED", "Guru Meditation") + dut.expect_none("Guru Meditation") test_common(dut, test_name) @@ -44,11 +44,11 @@ def int_wdt_cache_disabled_inner(env, test_name): dut.expect_gme("Interrupt wdt timeout on CPU0") dut.expect_reg_dump(0) dut.expect("Backtrace:") - dut.expect_none("CORRUPTED", "Guru Meditation") + dut.expect_none("Guru Meditation") dut.expect_reg_dump(1) - dut.expect("Backtrace:") + dut.expect_backtrace() dut.expect_elf_sha256() - dut.expect_none("CORRUPTED", "Guru Meditation") + dut.expect_none("Guru Meditation") test_common(dut, test_name) @@ -57,18 +57,18 @@ def cache_error_inner(env, test_name): dut.expect("Re-enable cpu cache.") dut.expect_gme("Cache disabled but cached memory region accessed") dut.expect_reg_dump(0) - dut.expect("Backtrace:") + dut.expect_backtrace() dut.expect_elf_sha256() - dut.expect_none("CORRUPTED", "Guru Meditation") + dut.expect_none("Guru Meditation") test_common(dut, test_name) def abort_inner(env, test_name): with get_dut(env, test_name, "test_abort") as dut: dut.expect(re.compile(r"abort\(\) was called at PC [0-9xa-f]+ on core 0")) - dut.expect("Backtrace:") + dut.expect_backtrace() dut.expect_elf_sha256() - dut.expect_none("CORRUPTED", "Guru Meditation", "Re-entered core dump") + dut.expect_none("Guru Meditation", "Re-entered core dump") test_common(dut, test_name) @@ -76,9 +76,9 @@ def storeprohibited_inner(env, test_name): with get_dut(env, test_name, "test_storeprohibited") as dut: dut.expect_gme("StoreProhibited") dut.expect_reg_dump(0) - dut.expect("Backtrace:") + dut.expect_backtrace() dut.expect_elf_sha256() - dut.expect_none("CORRUPTED", "Guru Meditation") + dut.expect_none("Guru Meditation") test_common(dut, test_name) @@ -87,9 +87,9 @@ def stack_overflow_inner(env, test_name): dut.expect_gme("Unhandled debug exception") dut.expect("Stack canary watchpoint triggered (main)") dut.expect_reg_dump(0) - dut.expect("Backtrace:") + dut.expect_backtrace() dut.expect_elf_sha256() - dut.expect_none("CORRUPTED", "Guru Meditation") + dut.expect_none("Guru Meditation") test_common(dut, test_name) @@ -97,9 +97,9 @@ def illegal_instruction_inner(env, test_name): with get_dut(env, test_name, "test_illegal_instruction") as dut: dut.expect_gme("IllegalInstruction") dut.expect_reg_dump(0) - dut.expect("Backtrace:") + dut.expect_backtrace() dut.expect_elf_sha256() - dut.expect_none("CORRUPTED", "Guru Meditation") + dut.expect_none("Guru Meditation") test_common(dut, test_name) @@ -109,5 +109,5 @@ def instr_fetch_prohibited_inner(env, test_name): dut.expect_reg_dump(0) dut.expect_backtrace() dut.expect_elf_sha256() - dut.expect_none("CORRUPTED", "Guru Meditation") + dut.expect_none("Guru Meditation") test_common(dut, test_name)