@@ -19,22 +19,22 @@ def task_wdt_inner(env, test_name):
19
19
dut .expect ("CPU 0: main" )
20
20
dut .expect (re .compile (r"abort\(\) was called at PC [0-9xa-f]+ on core 0" ))
21
21
dut .expect_none ("register dump:" )
22
- dut .expect ( "Backtrace:" )
22
+ dut .expect_backtrace ( )
23
23
dut .expect_elf_sha256 ()
24
- dut .expect_none ("CORRUPTED" , " Guru Meditation" )
24
+ dut .expect_none ("Guru Meditation" )
25
25
test_common (dut , test_name )
26
26
27
27
28
28
def int_wdt_inner (env , test_name ):
29
29
with get_dut (env , test_name , "test_int_wdt" , qemu_wdt_enable = True ) as dut :
30
30
dut .expect_gme ("Interrupt wdt timeout on CPU0" )
31
31
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" )
34
34
dut .expect_reg_dump (1 )
35
- dut .expect ( "Backtrace:" )
35
+ dut .expect_backtrace ( )
36
36
dut .expect_elf_sha256 ()
37
- dut .expect_none ("CORRUPTED" , " Guru Meditation" )
37
+ dut .expect_none ("Guru Meditation" )
38
38
test_common (dut , test_name )
39
39
40
40
@@ -44,11 +44,11 @@ def int_wdt_cache_disabled_inner(env, test_name):
44
44
dut .expect_gme ("Interrupt wdt timeout on CPU0" )
45
45
dut .expect_reg_dump (0 )
46
46
dut .expect ("Backtrace:" )
47
- dut .expect_none ("CORRUPTED" , " Guru Meditation" )
47
+ dut .expect_none ("Guru Meditation" )
48
48
dut .expect_reg_dump (1 )
49
- dut .expect ( "Backtrace:" )
49
+ dut .expect_backtrace ( )
50
50
dut .expect_elf_sha256 ()
51
- dut .expect_none ("CORRUPTED" , " Guru Meditation" )
51
+ dut .expect_none ("Guru Meditation" )
52
52
test_common (dut , test_name )
53
53
54
54
@@ -57,28 +57,28 @@ def cache_error_inner(env, test_name):
57
57
dut .expect ("Re-enable cpu cache." )
58
58
dut .expect_gme ("Cache disabled but cached memory region accessed" )
59
59
dut .expect_reg_dump (0 )
60
- dut .expect ( "Backtrace:" )
60
+ dut .expect_backtrace ( )
61
61
dut .expect_elf_sha256 ()
62
- dut .expect_none ("CORRUPTED" , " Guru Meditation" )
62
+ dut .expect_none ("Guru Meditation" )
63
63
test_common (dut , test_name )
64
64
65
65
66
66
def abort_inner (env , test_name ):
67
67
with get_dut (env , test_name , "test_abort" ) as dut :
68
68
dut .expect (re .compile (r"abort\(\) was called at PC [0-9xa-f]+ on core 0" ))
69
- dut .expect ( "Backtrace:" )
69
+ dut .expect_backtrace ( )
70
70
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" )
72
72
test_common (dut , test_name )
73
73
74
74
75
75
def storeprohibited_inner (env , test_name ):
76
76
with get_dut (env , test_name , "test_storeprohibited" ) as dut :
77
77
dut .expect_gme ("StoreProhibited" )
78
78
dut .expect_reg_dump (0 )
79
- dut .expect ( "Backtrace:" )
79
+ dut .expect_backtrace ( )
80
80
dut .expect_elf_sha256 ()
81
- dut .expect_none ("CORRUPTED" , " Guru Meditation" )
81
+ dut .expect_none ("Guru Meditation" )
82
82
test_common (dut , test_name )
83
83
84
84
@@ -87,19 +87,19 @@ def stack_overflow_inner(env, test_name):
87
87
dut .expect_gme ("Unhandled debug exception" )
88
88
dut .expect ("Stack canary watchpoint triggered (main)" )
89
89
dut .expect_reg_dump (0 )
90
- dut .expect ( "Backtrace:" )
90
+ dut .expect_backtrace ( )
91
91
dut .expect_elf_sha256 ()
92
- dut .expect_none ("CORRUPTED" , " Guru Meditation" )
92
+ dut .expect_none ("Guru Meditation" )
93
93
test_common (dut , test_name )
94
94
95
95
96
96
def illegal_instruction_inner (env , test_name ):
97
97
with get_dut (env , test_name , "test_illegal_instruction" ) as dut :
98
98
dut .expect_gme ("IllegalInstruction" )
99
99
dut .expect_reg_dump (0 )
100
- dut .expect ( "Backtrace:" )
100
+ dut .expect_backtrace ( )
101
101
dut .expect_elf_sha256 ()
102
- dut .expect_none ("CORRUPTED" , " Guru Meditation" )
102
+ dut .expect_none ("Guru Meditation" )
103
103
test_common (dut , test_name )
104
104
105
105
@@ -109,5 +109,5 @@ def instr_fetch_prohibited_inner(env, test_name):
109
109
dut .expect_reg_dump (0 )
110
110
dut .expect_backtrace ()
111
111
dut .expect_elf_sha256 ()
112
- dut .expect_none ("CORRUPTED" , " Guru Meditation" )
112
+ dut .expect_none ("Guru Meditation" )
113
113
test_common (dut , test_name )
0 commit comments