[llvm-branch-commits] [lldb] r270545 - Merging r262819:

[Mohit K. Bhakkad via llvm-branch-commits]

Author: mohit.bhakkad
Date: Tue May 24 05:49:10 2016
New Revision: 270545

URL: http://llvm.org/viewvc/llvm-project?rev=270545&view=rev
Log:
Merging r262819:
------------------------------------------------------------------------
r262819 | mohit.bhakkad | 2016-03-07 14:42:49 +0530 (Mon, 07 Mar 2016) | 7 lines

[LLDB][MIPS] Fix TestDisassembleBreakpoint

Patch by Nitesh Jain

Reviewers: clayborg, jaydeep.
Subscribers: bhushan, mohit.bhakkad, sagar, lldb-commits.
Differential Revision: http://reviews.llvm.org/D17597
------------------------------------------------------------------------

Modified:
    lldb/branches/release_38/   (props changed)
    lldb/branches/release_38/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py

Propchange: lldb/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 24 05:49:10 2016
@@ -1,3 +1,3 @@
 /lldb/branches/apple/python-GIL:156467-162159
 /lldb/branches/iohandler:198360-200250
-/lldb/trunk:257691-257692,257926,258485,258621,258684-258685,258758,258761,258919,258967,259188,260072,260362
+/lldb/trunk:257691-257692,257926,258485,258621,258684-258685,258758,258761,258919,258967,259188,260072,260362,262819

Modified: lldb/branches/release_38/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_38/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py?rev=270545&r1=270544&r2=270545&view=diff
==============================================================================
--- lldb/branches/release_38/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py (original)
+++ lldb/branches/release_38/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py Tue May 24 05:49:10 2016
@@ -41,7 +41,7 @@ class DisassemblyTestCase(TestBase):
             instructions = [' add ', ' ldr ', ' str ']
         elif re.match("mips" , arch):
             breakpoint_opcodes = ["break"]
-            instructions = ['lw', 'sw', 'jr']
+            instructions = ['lw', 'sw']
         else:
             # TODO please add your arch here
             self.fail('unimplemented for arch = "{arch}"'.format(arch=self.getArchitecture()))