Author: jingham
Date: Thu Oct 10 11:19:27 2019
New Revision: 374412
URL: http://llvm.org/viewvc/llvm-project?rev=374412&view=rev
Log:
Die, TABS, die, die, die, die...
Not sure how tabs got into this file, but they don't belong there.
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py?rev=374412&r1=374411&r2=374412&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py
Thu Oct 10 11:19:27 2019
@@ -298,10 +298,10 @@ class BreakpointSerialization(TestBase):
def do_check_extra_args(self):
import side_effect
- interp = self.dbg.GetCommandInterpreter()
- error = lldb.SBError()
+ interp = self.dbg.GetCommandInterpreter()
+ error = lldb.SBError()
- script_name = os.path.join(self.getSourceDir(), "resolver.py")
+ script_name = os.path.join(self.getSourceDir(), "resolver.py")
command = "command script import " + script_name
result = lldb.SBCommandReturnObject()
@@ -376,3 +376,7 @@ class BreakpointSerialization(TestBase):
self.assertEqual(copy_value, "second_value")
else:
self.Fail("Unknown key: %s"%(key))
+<<<<<<< HEAD
+=======
+
+>>>>>>> Die, TABS, die, die, die, die...
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
