[lldb] Fix TestStepOverWatchpoint

This commit is contained in:
Pavel Labath 2023-03-21 10:44:40 +01:00
parent 3cfb081c19
commit 090205fb57

View File

@ -34,13 +34,13 @@ class TestStepOverWatchpoint(TestBase):
# stepping off from the breakpoint:
bkpt.SetEnabled(False)
return (target, process, thread, read_watchpoint)
return (target, process, thread, frame, read_watchpoint)
# Read-write watchpoints not supported on SystemZ
@expectedFailureAll(archs=['s390x'])
@add_test_categories(["basic_process"])
def test_step_over(self):
target, process, thread, wp = self.get_to_start("Set a breakpoint here")
target, process, thread, frame, wp = self.get_to_start("Set a breakpoint here")
thread.StepOver()
self.assertStopReason(thread.GetStopReason(), lldb.eStopReasonWatchpoint,
@ -61,7 +61,7 @@ class TestStepOverWatchpoint(TestBase):
bugnumber="<rdar://problem/34027183>")
@add_test_categories(["basic_process"])
def test_step_instruction(self):
target, process, thread, wp = self.get_to_start("Set breakpoint after call")
target, process, thread, frame, wp = self.get_to_start("Set breakpoint after call")
self.step_inst_for_watchpoint(1)
@ -75,6 +75,7 @@ class TestStepOverWatchpoint(TestBase):
if re.match("^mips", arch) or re.match("powerpc64le", arch):
self.runCmd("watchpoint delete 1")
error = lldb.SBError()
# resolve_location=True, read=False, write=True
write_watchpoint = write_value.Watch(True, False, True, error)
self.assertTrue(write_watchpoint, "Failed to set write watchpoint.")