diff options
author | Jim Ingham <jingham@apple.com> | 2019-10-10 18:19:27 +0000 |
---|---|---|
committer | Jim Ingham <jingham@apple.com> | 2019-10-10 18:19:27 +0000 |
commit | 85026a6d947abad065e2ac8b1e75221325109759 (patch) | |
tree | 03ca1ffafb28f206b31daa6438788a9e2244ad53 | |
parent | 5bfc260a8ee93751a4a5d109e430302637e692fa (diff) | |
download | lldb-85026a6d947abad065e2ac8b1e75221325109759.tar.gz |
Die, TABS, die, die, die, die...
Not sure how tabs got into this file, but they don't belong there.
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@374412 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py b/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py index 36347b132..a015de648 100644 --- a/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py +++ b/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py @@ -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... |