diff options
| -rw-r--r-- | lldb/test/tools/lldb-server/TestLldbGdbServer.py | 7 | ||||
| -rw-r--r-- | lldb/test/tools/lldb-server/gdbremote_testcase.py | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lldb/test/tools/lldb-server/TestLldbGdbServer.py b/lldb/test/tools/lldb-server/TestLldbGdbServer.py index 1b36fdb06a3..5efb2257e82 100644 --- a/lldb/test/tools/lldb-server/TestLldbGdbServer.py +++ b/lldb/test/tools/lldb-server/TestLldbGdbServer.py @@ -1204,8 +1204,11 @@ class LldbGdbServerTestCase(gdbremote_testcase.GdbRemoteTestCaseBase): function_address = int(context.get("function_address"), 16) # Set the breakpoint. - # Note this might need to be switched per platform (ARM, mips, etc.). - BREAKPOINT_KIND = 1 + if self.getArchitecture() == "arm": + # TODO: Handle case when setting breakpoint in thumb code + BREAKPOINT_KIND = 4 + else: + BREAKPOINT_KIND = 1 self.reset_test_sequence() self.add_set_breakpoint_packets(function_address, do_continue=True, breakpoint_kind=BREAKPOINT_KIND) diff --git a/lldb/test/tools/lldb-server/gdbremote_testcase.py b/lldb/test/tools/lldb-server/gdbremote_testcase.py index b3ac63bca04..773ddede94a 100644 --- a/lldb/test/tools/lldb-server/gdbremote_testcase.py +++ b/lldb/test/tools/lldb-server/gdbremote_testcase.py @@ -1218,8 +1218,11 @@ class GdbRemoteTestCaseBase(TestBase): g_c2_address = int(context.get("g_c2_address"), 16) # Set a breakpoint at the given address. - # Note this might need to be switched per platform (ARM, mips, etc.). - BREAKPOINT_KIND = 1 + if self.getArchitecture() == "arm": + # TODO: Handle case when setting breakpoint in thumb code + BREAKPOINT_KIND = 4 + else: + BREAKPOINT_KIND = 1 self.reset_test_sequence() self.add_set_breakpoint_packets(function_address, do_continue=True, breakpoint_kind=BREAKPOINT_KIND) context = self.expect_gdbremote_sequence() |
