vendor/lldb/lldb-trunk-r290819

2 files changed, 28 insertions, 21 deletions

diff --git a/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassembleRawData.py b/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassembleRawData.py
index 311791cca014..97261c70ec96 100644
--- a/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassembleRawData.py
+++ b/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassembleRawData.py
@@ -5,14 +5,15 @@ Use lldb Python API to disassemble raw machine code bytes
 from __future__ import print_function
 
 
-
-import os, time
+import os
+import time
 import re
 import lldb
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
+
 class DisassembleRawDataTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
@@ -24,16 +25,16 @@ class DisassembleRawDataTestCase(TestBase):
         """Test disassembling raw bytes with the API."""
         # Create a target from the debugger.
         arch = self.getArchitecture()
-        if re.match("mips*el",arch):
-            target = self.dbg.CreateTargetWithFileAndTargetTriple ("", "mipsel")
-            raw_bytes = bytearray([0x21,0xf0, 0xa0, 0x03])
-        elif re.match("mips",arch):
-            target = self.dbg.CreateTargetWithFileAndTargetTriple ("", "mips")
-            raw_bytes = bytearray([0x03,0xa0, 0xf0, 0x21])
+        if re.match("mips*el", arch):
+            target = self.dbg.CreateTargetWithFileAndTargetTriple("", "mipsel")
+            raw_bytes = bytearray([0x21, 0xf0, 0xa0, 0x03])
+        elif re.match("mips", arch):
+            target = self.dbg.CreateTargetWithFileAndTargetTriple("", "mips")
+            raw_bytes = bytearray([0x03, 0xa0, 0xf0, 0x21])
         else:
-            target = self.dbg.CreateTargetWithFileAndTargetTriple ("", "x86_64")
+            target = self.dbg.CreateTargetWithFileAndTargetTriple("", "x86_64")
             raw_bytes = bytearray([0x48, 0x89, 0xe5])
-        
+
         self.assertTrue(target, VALID_TARGET)
         insts = target.GetInstructions(lldb.SBAddress(0, target), raw_bytes)
 
@@ -43,9 +44,11 @@ class DisassembleRawDataTestCase(TestBase):
             print()
             print("Raw bytes:    ", [hex(x) for x in raw_bytes])
             print("Disassembled%s" % str(inst))
-        if re.match("mips",arch):
-            self.assertTrue (inst.GetMnemonic(target) == "move")
-            self.assertTrue (inst.GetOperands(target) == '$' + "fp, " + '$' + "sp")
+        if re.match("mips", arch):
+            self.assertTrue(inst.GetMnemonic(target) == "move")
+            self.assertTrue(inst.GetOperands(target) ==
+                            '$' + "fp, " + '$' + "sp")
         else:
-            self.assertTrue (inst.GetMnemonic(target) == "movq")
-            self.assertTrue (inst.GetOperands(target) == '%' + "rsp, " + '%' + "rbp")
+            self.assertTrue(inst.GetMnemonic(target) == "movq")
+            self.assertTrue(inst.GetOperands(target) ==
+                            '%' + "rsp, " + '%' + "rbp")
diff --git a/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py b/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
index f991ab329a89..1e1e4d74f416 100644
--- a/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
+++ b/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
@@ -5,25 +5,29 @@ Use lldb Python API to disassemble raw machine code bytes
 from __future__ import print_function
 
 
-
-import os, time
+import os
+import time
 import re
 import lldb
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
+
 class Disassemble_VST1_64(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @skipTestIfFn(lambda : True, "llvm.org/pr24575: all tests get ERRORs in dotest.py after this")
+    @skipTestIfFn(
+        lambda: True,
+        "llvm.org/pr24575: all tests get ERRORs in dotest.py after this")
     @add_test_categories(['pyapi'])
     @no_debug_info_test
+    @skipIf(triple='^mips')
     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")
         self.assertTrue(target, VALID_TARGET)
 
         raw_bytes = bytearray([0xf0, 0xb5, 0x03, 0xaf,
@@ -55,5 +59,5 @@ class Disassemble_VST1_64(TestBase):
             print()
             print("Raw bytes:    ", [hex(x) for x in raw_bytes])
             print("Disassembled%s" % str(inst))
- 
-        self.assertTrue (inst.GetMnemonic(target) == "vst1.64")
+
+        self.assertTrue(inst.GetMnemonic(target) == "vst1.64")