[Lldb-commits] [PATCH] D23395: Make sure LldbGdbServerTestCase is built in arm mode to avoid failures due thumb instructions

[Muhammad Omair Javaid via lldb-commits]

omjavaid created this revision.
omjavaid added a reviewer: labath.
omjavaid added a subscriber: lldb-commits.
Herald added subscribers: samparker, rengolin, aemerson.

LldbGdbServerTestCase.test_software_breakpoint_set* are failing when breakpoint target address is an thumb16 instruction.

Test right now doesnt handle thumb mode which means that it should only be built in arm mode using -marm flag in gcc.

This patch makes sure that we are building this test in arm mode.



https://reviews.llvm.org/D23395

Files:
  packages/Python/lldbsuite/test/tools/lldb-server/Makefile
  packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py

Index: packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py
===================================================================
--- packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py
+++ packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py
@@ -1233,15 +1233,23 @@
     @debugserver_test
     def test_software_breakpoint_set_and_remove_work_debugserver(self):
         self.init_debugserver_test()
-        self.build()
+        if self.getArchitecture() == "arm":
+            # TODO: Handle case when setting breakpoint in thumb code
+            self.build(dictionary={'CFLAGS_EXTRAS': '-marm'})
+        else:
+            self.build()
         self.set_inferior_startup_launch()
         self.software_breakpoint_set_and_remove_work()
 
     @llgs_test
     @expectedFlakeyLinux("llvm.org/pr25652")
     def test_software_breakpoint_set_and_remove_work_llgs(self):
         self.init_llgs_test()
-        self.build()
+        if self.getArchitecture() == "arm":
+            # TODO: Handle case when setting breakpoint in thumb code
+            self.build(dictionary={'CFLAGS_EXTRAS': '-marm'})
+        else:
+            self.build()
         self.set_inferior_startup_launch()
         self.software_breakpoint_set_and_remove_work()
 
Index: packages/Python/lldbsuite/test/tools/lldb-server/Makefile
===================================================================
--- packages/Python/lldbsuite/test/tools/lldb-server/Makefile
+++ packages/Python/lldbsuite/test/tools/lldb-server/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../../make
 
-CFLAGS_EXTRAS += -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS
+override CFLAGS_EXTRAS += -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS
 ENABLE_THREADS := YES
 CXX_SOURCES := main.cpp
 MAKE_DSYM :=NO


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D23395.67663.patch
Type: text/x-patch
Size: 1792 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20160811/6a784096/attachment.bin>