[Lldb-commits] [lldb] r374863 - Fix TestDisassemble_VST1_64

[Pavel Labath via lldb-commits]

Author: labath
Date: Tue Oct 15 00:20:01 2019
New Revision: 374863

URL: http://llvm.org/viewvc/llvm-project?rev=374863&view=rev
Log:
Fix TestDisassemble_VST1_64

- use a full triple instead of just the architecture (makes the test
  pass on non-apple hosts)
- skip the test if the ARM llvm target is not built

Modified:
    lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py

Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py?rev=374863&r1=374862&r2=374863&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py Tue Oct 15 00:20:01 2019
@@ -19,11 +19,11 @@ class Disassemble_VST1_64(TestBase):
 
     @add_test_categories(['pyapi'])
     @no_debug_info_test
-    @skipIf(triple='^mips')
+    @skipIfLLVMTargetMissing("ARM")
     def test_disassemble_invalid_vst_1_64_raw_data(self):
         """Test disassembling invalid vst1.64 raw bytes with the API."""
         # Create a target from the debugger.
-        target = self.dbg.CreateTargetWithFileAndTargetTriple("", "thumbv7")
+        target = self.dbg.CreateTargetWithFileAndTargetTriple("", "thumbv7-apple-macosx")
         self.assertTrue(target, VALID_TARGET)
 
         raw_bytes = bytearray([0xf0, 0xb5, 0x03, 0xaf,
@@ -45,6 +45,11 @@ class Disassemble_VST1_64(TestBase):
 
         insts = target.GetInstructions(lldb.SBAddress(), raw_bytes)
 
+        if self.TraceOn():
+            print()
+            for i in insts:
+                print("Disassembled %s" % str(i))
+
         if sys.version_info.major >= 3:
             sio = StringIO()
             insts.Print(sio)
@@ -59,11 +64,6 @@ class Disassemble_VST1_64(TestBase):
                 inst.Print(sio)
                 self.assertEqual(asm, sio.getvalue().strip())
 
-        if self.TraceOn():
-            print()
-            for i in insts:
-                print("Disassembled%s" % str(i))
-
         raw_bytes = bytearray([0x04, 0xf9, 0xed, 0x82])
 
         insts = target.GetInstructions(lldb.SBAddress(), raw_bytes)