diff options
| -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... |