Skip to content

Commit 8274de2

Browse files
gottesmmgottesmm
committed
[lldb] Simplify logic in a test by using lldbutil.run_to_source_breakpoint.
1 parent 50b1dc7 commit 8274de2

File tree

2 files changed

+56
-113
lines changed

2 files changed

+56
-113
lines changed

‎lldb/test/API/lang/swift/variables/move_function/TestSwiftMoveFunction.py

Lines changed: 3 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,9 @@ def test_swift_move_function(self):
3737
"""
3838
self.build()
3939

40-
self.exec_artifact = self.getBuildArtifact(self.exec_name)
41-
self.target = self.dbg.CreateTarget(self.exec_artifact)
42-
self.assertTrue(self.target, VALID_TARGET)
43-
44-
self.do_setup_breakpoints()
45-
46-
self.process = self.target.LaunchSimple(None, None, os.getcwd())
47-
threads = lldbutil.get_threads_stopped_at_breakpoint(
48-
self.process, self.breakpoints[0])
49-
self.assertEqual(len(threads), 1)
50-
self.thread = threads[0]
40+
self.target, self.process, self.thread, self.bkpt = \
41+
lldbutil.run_to_source_breakpoint(
42+
self, 'Set breakpoint', lldb.SBFileSpec('main.swift'))
5143

5244
self.do_check_copyable_value_test()
5345
self.do_check_copyable_var_test()
@@ -74,59 +66,10 @@ def setUp(self):
7466
self.main_source_spec = lldb.SBFileSpec(self.main_source)
7567
self.exec_name = "a.out"
7668

77-
def add_breakpoints(self, name, num_breakpoints):
78-
pattern = 'Set breakpoint {} here {}'
79-
for i in range(num_breakpoints):
80-
pat = pattern.format(name, i+1)
81-
brk = self.target.BreakpointCreateBySourceRegex(
82-
pat, self.main_source_spec)
83-
self.assertGreater(brk.GetNumLocations(), 0, VALID_BREAKPOINT)
84-
yield brk
85-
8669
def get_var(self, name):
8770
frame = self.thread.frames[0]
88-
self.assertTrue(frame.IsValid(), "Couldn't get a frame.")
8971
return frame.FindVariable(name)
9072

91-
def do_setup_breakpoints(self):
92-
self.breakpoints = []
93-
94-
self.breakpoints.extend(
95-
self.add_breakpoints('copyableValueTest', 3))
96-
self.breakpoints.extend(
97-
self.add_breakpoints('addressOnlyValueTest', 3))
98-
self.breakpoints.extend(
99-
self.add_breakpoints('copyableVarTest', 4))
100-
self.breakpoints.extend(
101-
self.add_breakpoints('addressOnlyVarTest', 4))
102-
103-
self.breakpoints.extend(
104-
self.add_breakpoints('copyableValueArgTest', 3))
105-
self.breakpoints.extend(
106-
self.add_breakpoints('addressOnlyValueArgTest', 3))
107-
self.breakpoints.extend(
108-
self.add_breakpoints('copyableVarArgTest', 4))
109-
self.breakpoints.extend(
110-
self.add_breakpoints('addressOnlyVarArgTest', 4))
111-
112-
self.breakpoints.extend(
113-
self.add_breakpoints('copyableValueCCFTrueTest',
114-
5))
115-
self.breakpoints.extend(
116-
self.add_breakpoints('copyableValueCCFFalseTest',
117-
3))
118-
self.breakpoints.extend(
119-
self.add_breakpoints('copyableVarTestCCFlowTrueReinitOutOfBlockTest',
120-
5))
121-
self.breakpoints.extend(
122-
self.add_breakpoints('copyableVarTestCCFlowTrueReinitInBlockTest',
123-
5))
124-
self.breakpoints.extend(
125-
self.add_breakpoints('copyableVarTestCCFlowFalseReinitOutOfBlockTest',
126-
4))
127-
self.breakpoints.extend(
128-
self.add_breakpoints('copyableVarTestCCFlowFalseReinitInBlockTest', 3))
129-
13073
def do_check_copyable_value_test(self):
13174
# We haven't defined varK yet.
13275
varK = self.get_var('k')

‎lldb/test/API/lang/swift/variables/move_function/main.swift

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -31,146 +31,146 @@ var falseBoolValue : Bool { false }
3131
//////////////////
3232

3333
public func copyableValueTest() {
34-
print("stop here") // Set breakpoint copyableValueTest here 1
34+
print("stop here") // Set breakpoint
3535
let k = Klass()
3636
k.doSomething()
37-
let m = _move(k) // Set breakpoint copyableValueTest here 2
38-
m.doSomething() // Set breakpoint copyableValueTest here 3
37+
let m = _move(k) // Set breakpoint
38+
m.doSomething() // Set breakpoint
3939
}
4040

4141
public func copyableVarTest() {
42-
print("stop here") // Set breakpoint copyableVarTest here 1
42+
print("stop here") // Set breakpoint
4343
var k = Klass()
4444
k.doSomething()
45-
let m = _move(k) // Set breakpoint copyableVarTest here 2
45+
let m = _move(k) // Set breakpoint
4646
m.doSomething()
47-
k = Klass() // Set breakpoint copyableVarTest here 3
48-
k.doSomething() // Set breakpoint copyableVarTest here 4
47+
k = Klass() // Set breakpoint
48+
k.doSomething() // Set breakpoint
4949
print("stop here")
5050
}
5151

5252
public func addressOnlyValueTest<T : P>(_ x: T) {
53-
print("stop here") // Set breakpoint addressOnlyValueTest here 1
53+
print("stop here") // Set breakpoint
5454
let k = x
5555
k.doSomething()
56-
let m = _move(k) // Set breakpoint addressOnlyValueTest here 2
57-
m.doSomething() // Set breakpoint addressOnlyValueTest here 3
56+
let m = _move(k) // Set breakpoint
57+
m.doSomething() // Set breakpoint
5858
}
5959

6060
public func addressOnlyVarTest<T : P>(_ x: T) {
61-
print("stop here") // Set breakpoint addressOnlyVarTest here 1
61+
print("stop here") // Set breakpoint
6262
var k = x
6363
k.doSomething()
64-
let m = _move(k) // Set breakpoint addressOnlyVarTest here 2
64+
let m = _move(k) // Set breakpoint
6565
m.doSomething()
66-
k = x // Set breakpoint addressOnlyVarTest here 3
67-
k.doSomething() // Set breakpoint addressOnlyVarTest here 4
66+
k = x // Set breakpoint
67+
k.doSomething() // Set breakpoint
6868
}
6969

7070
//////////////////////
7171
// Arg Simple Tests //
7272
//////////////////////
7373

7474
public func copyableValueArgTest(_ k: __owned Klass) {
75-
print("stop here") // Set breakpoint copyableValueArgTest here 1
75+
print("stop here") // Set breakpoint
7676
k.doSomething()
77-
let m = _move(k) // Set breakpoint copyableValueArgTest here 2
78-
m.doSomething() // Set breakpoint copyableValueArgTest here 3
77+
let m = _move(k) // Set breakpoint
78+
m.doSomething() // Set breakpoint
7979
}
8080

8181
public func copyableVarArgTest(_ k: inout Klass) {
82-
print("stop here") // Set breakpoint copyableVarArgTest here 1
82+
print("stop here") // Set breakpoint
8383
k.doSomething()
84-
let m = _move(k) // Set breakpoint copyableVarArgTest here 2
84+
let m = _move(k) // Set breakpoint
8585
m.doSomething()
86-
k = Klass() // Set breakpoint copyableVarArgTest here 3
87-
k.doSomething() // Set breakpoint copyableVarArgTest here 4
86+
k = Klass() // Set breakpoint
87+
k.doSomething() // Set breakpoint
8888
print("stop here")
8989
}
9090

9191
public func addressOnlyValueArgTest<T : P>(_ k: __owned T) {
92-
print("stop here") // Set breakpoint addressOnlyValueArgTest here 1
92+
print("stop here") // Set breakpoint
9393
k.doSomething()
94-
let m = _move(k) // Set breakpoint addressOnlyValueArgTest here 2
95-
m.doSomething() // Set breakpoint addressOnlyValueArgTest here 3
94+
let m = _move(k) // Set breakpoint
95+
m.doSomething() // Set breakpoint
9696
}
9797

9898
public func addressOnlyVarArgTest<T : P>(_ k: inout T, _ x: T) {
99-
print("stop here") // Set breakpoint addressOnlyVarArgTest here 1
99+
print("stop here") // Set breakpoint
100100
k.doSomething()
101-
let m = _move(k) // Set breakpoint addressOnlyVarArgTest here 2
101+
let m = _move(k) // Set breakpoint
102102
m.doSomething()
103-
k = x // Set breakpoint addressOnlyVarArgTest here 3
104-
k.doSomething() // Set breakpoint addressOnlyVarArgTest here 4
103+
k = x // Set breakpoint
104+
k.doSomething() // Set breakpoint
105105
}
106106

107107
////////////////////////////////////
108108
// Conditional Control Flow Tests //
109109
////////////////////////////////////
110110

111111
public func copyableValueCCFTrueTest() {
112-
let k = Klass() // Set breakpoint copyableValueCCFTrueTest here 1
113-
k.doSomething() // Set breakpoint copyableValueCCFTrueTest here 2
112+
let k = Klass() // Set breakpoint
113+
k.doSomething() // Set breakpoint
114114
if trueBoolValue {
115-
let m = _move(k) // Set breakpoint copyableValueCCFTrueTest here 3
116-
m.doSomething() // Set breakpoint copyableValueCCFTrueTest here 4
115+
let m = _move(k) // Set breakpoint
116+
m.doSomething() // Set breakpoint
117117
}
118-
// Set breakpoint copyableValueCCFTrueTest here 5
118+
// Set breakpoint
119119
}
120120

121121
public func copyableValueCCFFalseTest() {
122-
let k = Klass() // Set breakpoint copyableValueCCFFalseTest here 1
123-
k.doSomething() // Set breakpoint copyableValueCCFFalseTest here 2
122+
let k = Klass() // Set breakpoint
123+
k.doSomething() // Set breakpoint
124124
if falseBoolValue {
125125
let m = _move(k)
126126
m.doSomething()
127127
}
128-
// Set breakpoint copyableValueCCFFalseTest here 3
128+
// Set breakpoint
129129
}
130130

131131
public func copyableVarTestCCFlowTrueReinitOutOfBlockTest() {
132-
var k = Klass() // Set breakpoint copyableVarTestCCFlowTrueReinitOutOfBlockTest here 1
132+
var k = Klass() // Set breakpoint
133133
k.doSomething()
134134
if trueBoolValue {
135-
let m = _move(k) // Set breakpoint copyableVarTestCCFlowTrueReinitOutOfBlockTest here 2
136-
m.doSomething() // Set breakpoint copyableVarTestCCFlowTrueReinitOutOfBlockTest here 3
135+
let m = _move(k) // Set breakpoint
136+
m.doSomething() // Set breakpoint
137137
}
138-
k = Klass() // Set breakpoint copyableVarTestCCFlowTrueReinitOutOfBlockTest here 4
139-
k.doSomething() // Set breakpoint copyableVarTestCCFlowTrueReinitOutOfBlockTest here 5
138+
k = Klass() // Set breakpoint
139+
k.doSomething() // Set breakpoint
140140
}
141141

142142
public func copyableVarTestCCFlowTrueReinitInBlockTest() {
143-
var k = Klass() // Set breakpoint copyableVarTestCCFlowTrueReinitInBlockTest here 1
143+
var k = Klass() // Set breakpoint
144144
k.doSomething()
145145
if trueBoolValue {
146-
let m = _move(k) // Set breakpoint copyableVarTestCCFlowTrueReinitInBlockTest here 2
146+
let m = _move(k) // Set breakpoint
147147
m.doSomething()
148-
k = Klass() // Set breakpoint copyableVarTestCCFlowTrueReinitInBlockTest here 3
149-
k.doSomething() // Set breakpoint copyableVarTestCCFlowTrueReinitInBlockTest here 4
148+
k = Klass() // Set breakpoint
149+
k.doSomething() // Set breakpoint
150150
}
151-
k.doSomething() // Set breakpoint copyableVarTestCCFlowTrueReinitInBlockTest here 5
151+
k.doSomething() // Set breakpoint
152152
}
153153

154154
public func copyableVarTestCCFlowFalseReinitOutOfBlockTest() {
155-
var k = Klass() // Set breakpoint copyableVarTestCCFlowFalseReinitOutOfBlockTest here 1
156-
k.doSomething() // Set breakpoint copyableVarTestCCFlowFalseReinitOutOfBlockTest here 2
155+
var k = Klass() // Set breakpoint
156+
k.doSomething() // Set breakpoint
157157
if falseBoolValue {
158158
let m = _move(k)
159159
m.doSomething()
160160
}
161-
k = Klass() // Set breakpoint copyableVarTestCCFlowFalseReinitOutOfBlockTest here 3
162-
k.doSomething() // Set breakpoint copyableVarTestCCFlowFalseReinitOutOfBlockTest here 4
161+
k = Klass() // Set breakpoint
162+
k.doSomething() // Set breakpoint
163163
}
164164

165165
public func copyableVarTestCCFlowFalseReinitInBlockTest() {
166-
var k = Klass() // Set breakpoint copyableVarTestCCFlowFalseReinitInBlockTest here 1
167-
k.doSomething() // Set breakpoint copyableVarTestCCFlowFalseReinitInBlockTest here 2
166+
var k = Klass() // Set breakpoint
167+
k.doSomething() // Set breakpoint
168168
if falseBoolValue {
169169
let m = _move(k)
170170
m.doSomething()
171171
k = Klass()
172172
}
173-
k.doSomething() // Set breakpoint copyableVarTestCCFlowFalseReinitInBlockTest here 3
173+
k.doSomething() // Set breakpoint
174174
}
175175

176176
//////////////////////////

0 commit comments

Comments
 (0)