@@ -40,28 +40,24 @@ def test(self):
40
40
target = self .dbg .CreateTarget (exe )
41
41
self .assertTrue (target , VALID_TARGET )
42
42
43
- bp1_line = line_number ("main.c" , "// Set breakpoint 1 here" )
44
- bp2_line = line_number ("main.c" , "// Set breakpoint 2 here" )
45
-
46
- lldbutil .run_break_set_by_file_and_line (
47
- self , "main.c" , bp1_line , num_expected_locations = 1
48
- )
49
- lldbutil .run_break_set_by_file_and_line (
50
- self , "main.c" , bp2_line , num_expected_locations = 1
51
- )
43
+ main_dot_c = lldb .SBFileSpec ("main.c" )
44
+ bp1 = target .BreakpointCreateBySourceRegex ("// Set breakpoint 1 here" , main_dot_c )
45
+ bp2 = target .BreakpointCreateBySourceRegex ("// Set breakpoint 2 here" , main_dot_c )
52
46
53
47
process = target .LaunchSimple (None , None , self .get_process_working_directory ())
54
48
self .assertTrue (process , VALID_PROCESS )
55
49
56
- thread = process .GetThreadAtIndex (0 )
50
+ thread = self .thread ()
51
+
57
52
if self .TraceOn ():
58
53
print ("Backtrace at the first breakpoint:" )
59
54
for f in thread .frames :
60
55
print (f )
56
+
61
57
# Check that we have stopped at correct breakpoint.
62
58
self .assertEqual (
63
- process . GetThreadAtIndex ( 0 ) .frame [0 ].GetLineEntry ().GetLine (),
64
- bp1_line ,
59
+ thread .frame [0 ].GetLineEntry ().GetLine (),
60
+ bp1 . GetLocationAtIndex ( 0 ). GetAddress (). GetLineEntry (). GetLine () ,
65
61
"LLDB reported incorrect line number." ,
66
62
)
67
63
@@ -70,15 +66,14 @@ def test(self):
70
66
# 'continue' command.
71
67
process .Continue ()
72
68
73
- thread = process .GetThreadAtIndex (0 )
74
69
if self .TraceOn ():
75
70
print ("Backtrace at the second breakpoint:" )
76
71
for f in thread .frames :
77
72
print (f )
78
73
# Check that we have stopped at the breakpoint
79
74
self .assertEqual (
80
75
thread .frame [0 ].GetLineEntry ().GetLine (),
81
- bp2_line ,
76
+ bp2 . GetLocationAtIndex ( 0 ). GetAddress (). GetLineEntry (). GetLine () ,
82
77
"LLDB reported incorrect line number." ,
83
78
)
84
79
# Double-check with GetPCAddress()
0 commit comments