Skip to content

Commit 4f4a7bc

Browse files
[lldb][nfc] Fix helper function in test
This just deletes the initial breakpoint so other parts of the test don't need to consider it.
1 parent ac66248 commit 4f4a7bc

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

lldb/test/API/lang/swift/closures_var_not_captured/TestSwiftClosureVarNotCaptured.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,24 @@ def check_no_enhanced_diagnostic(test, frame, var_name):
4545

4646
class TestSwiftClosureVarNotCaptured(TestBase):
4747
def get_to_bkpt(self, bkpt_name):
48-
return lldbutil.run_to_source_breakpoint(
48+
target, process, thread, bkpt = lldbutil.run_to_source_breakpoint(
4949
self, bkpt_name, lldb.SBFileSpec("main.swift")
5050
)
51+
target.BreakpointDelete(bkpt.GetID())
52+
return (target, process, thread)
5153

5254
@swiftTest
5355
def test_simple_closure(self):
5456
self.build()
55-
(target, process, thread, bkpt) = self.get_to_bkpt("break_simple_closure")
57+
(target, process, thread) = self.get_to_bkpt("break_simple_closure")
5658
check_not_captured_error(self, thread.frames[0], "var_in_foo", "func_1(arg:)")
5759
check_not_captured_error(self, thread.frames[0], "arg", "func_1(arg:)")
5860
check_no_enhanced_diagnostic(self, thread.frames[0], "dont_find_me")
5961

6062
@swiftTest
6163
def test_nested_closure(self):
6264
self.build()
63-
(target, process, thread, bkpt) = self.get_to_bkpt("break_double_closure_1")
65+
(target, process, thread) = self.get_to_bkpt("break_double_closure_1")
6466
check_not_captured_error(self, thread.frames[0], "var_in_foo", "func_2(arg:)")
6567
check_not_captured_error(self, thread.frames[0], "arg", "func_2(arg:)")
6668
check_not_captured_error(
@@ -86,7 +88,7 @@ def test_nested_closure(self):
8688
@skipIf(oslist=["windows", "linux"])
8789
def test_async_closure(self):
8890
self.build()
89-
(target, process, thread, bkpt) = self.get_to_bkpt("break_async_closure_1")
91+
(target, process, thread) = self.get_to_bkpt("break_async_closure_1")
9092
check_not_captured_error(self, thread.frames[0], "var_in_foo", "func_3(arg:)")
9193
check_not_captured_error(self, thread.frames[0], "arg", "func_3(arg:)")
9294
check_not_captured_error(
@@ -107,7 +109,7 @@ def test_async_closure(self):
107109
@swiftTest
108110
def test_ctor_class_closure(self):
109111
self.build()
110-
(target, process, thread, bkpt) = self.get_to_bkpt("break_ctor_class")
112+
(target, process, thread) = self.get_to_bkpt("break_ctor_class")
111113
check_not_captured_error(self, thread.frames[0], "input", "MY_STRUCT.init(input:)")
112114
check_not_captured_error(self, thread.frames[0], "find_me", "MY_STRUCT.init(input:)")
113115
check_no_enhanced_diagnostic(self, thread.frames[0], "dont_find_me")

0 commit comments

Comments
 (0)