From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001 From: Kate Stone Date: Tue, 6 Sep 2016 20:57:50 +0000 Subject: *** This commit represents a complete reformatting of the LLDB source code *** to conform to clang-format’s LLVM style. This kind of mass change has *** two obvious implications: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Firstly, merging this particular commit into a downstream fork may be a huge effort. Alternatively, it may be worth merging all changes up to this commit, performing the same reformatting operation locally, and then discarding the merge for this particular commit. The commands used to accomplish this reformatting were as follows (with current working directory as the root of the repository): find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} + find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ; The version of clang-format used was 3.9.0, and autopep8 was 1.2.4. Secondly, “blame” style tools will generally point to this commit instead of a meaningful prior commit. There are alternatives available that will attempt to look through this change and find the appropriate prior commit. YMMV. llvm-svn: 280751 --- .../TestMembersAndLocalsWithSameName.py | 160 ++++++++++++++------- 1 file changed, 105 insertions(+), 55 deletions(-) (limited to 'lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name') diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py index 12fc4c23637..977ad7ddea1 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py @@ -2,6 +2,7 @@ import lldb from lldbsuite.test.lldbtest import * import lldbsuite.test.lldbutil as lldbutil + class TestMembersAndLocalsWithSameName(TestBase): mydir = TestBase.compute_mydir(__file__) @@ -10,77 +11,101 @@ class TestMembersAndLocalsWithSameName(TestBase): self._load_exe() # Set breakpoints - bp1 = self.target.BreakpointCreateBySourceRegex("Break 1", self.src_file_spec) - self.assertTrue(bp1.IsValid() and bp1.GetNumLocations() >= 1, VALID_BREAKPOINT) - bp2 = self.target.BreakpointCreateBySourceRegex("Break 2", self.src_file_spec) - self.assertTrue(bp2.IsValid() and bp2.GetNumLocations() >= 1, VALID_BREAKPOINT) - bp3 = self.target.BreakpointCreateBySourceRegex("Break 3", self.src_file_spec) - self.assertTrue(bp3.IsValid() and bp3.GetNumLocations() >= 1, VALID_BREAKPOINT) - bp4 = self.target.BreakpointCreateBySourceRegex("Break 4", self.src_file_spec) - self.assertTrue(bp4.IsValid() and bp4.GetNumLocations() >= 1, VALID_BREAKPOINT) + bp1 = self.target.BreakpointCreateBySourceRegex( + "Break 1", self.src_file_spec) + self.assertTrue( + bp1.IsValid() and bp1.GetNumLocations() >= 1, + VALID_BREAKPOINT) + bp2 = self.target.BreakpointCreateBySourceRegex( + "Break 2", self.src_file_spec) + self.assertTrue( + bp2.IsValid() and bp2.GetNumLocations() >= 1, + VALID_BREAKPOINT) + bp3 = self.target.BreakpointCreateBySourceRegex( + "Break 3", self.src_file_spec) + self.assertTrue( + bp3.IsValid() and bp3.GetNumLocations() >= 1, + VALID_BREAKPOINT) + bp4 = self.target.BreakpointCreateBySourceRegex( + "Break 4", self.src_file_spec) + self.assertTrue( + bp4.IsValid() and bp4.GetNumLocations() >= 1, + VALID_BREAKPOINT) # Launch the process - self.process = self.target.LaunchSimple(None, None, self.get_process_working_directory()) + self.process = self.target.LaunchSimple( + None, None, self.get_process_working_directory()) self.assertTrue(self.process.IsValid(), PROCESS_IS_VALID) - self.assertTrue(self.process.GetState() == lldb.eStateStopped, PROCESS_STOPPED) + self.assertTrue( + self.process.GetState() == lldb.eStateStopped, + PROCESS_STOPPED) self._test_globals() self.process.Continue() - self.assertTrue(self.process.GetState() == lldb.eStateStopped, PROCESS_STOPPED) - thread = lldbutil.get_stopped_thread(self.process, lldb.eStopReasonBreakpoint) + self.assertTrue( + self.process.GetState() == lldb.eStateStopped, + PROCESS_STOPPED) + thread = lldbutil.get_stopped_thread( + self.process, lldb.eStopReasonBreakpoint) self.assertTrue(thread.IsValid()) frame = thread.GetSelectedFrame() self.assertTrue(frame.IsValid()) - val = frame.EvaluateExpression("a"); + val = frame.EvaluateExpression("a") self.assertTrue(val.IsValid()) self.assertEqual(val.GetValueAsUnsigned(), 12345) - val = frame.EvaluateExpression("b"); + val = frame.EvaluateExpression("b") self.assertTrue(val.IsValid()) self.assertEqual(val.GetValueAsUnsigned(), 54321) - val = frame.EvaluateExpression("c"); + val = frame.EvaluateExpression("c") self.assertTrue(val.IsValid()) self.assertEqual(val.GetValueAsUnsigned(), 34567) self.process.Continue() - self.assertTrue(self.process.GetState() == lldb.eStateStopped, PROCESS_STOPPED) - thread = lldbutil.get_stopped_thread(self.process, lldb.eStopReasonBreakpoint) + self.assertTrue( + self.process.GetState() == lldb.eStateStopped, + PROCESS_STOPPED) + thread = lldbutil.get_stopped_thread( + self.process, lldb.eStopReasonBreakpoint) self.assertTrue(thread.IsValid()) frame = thread.GetSelectedFrame() self.assertTrue(frame.IsValid()) - val = frame.EvaluateExpression("a"); + val = frame.EvaluateExpression("a") self.assertTrue(val.IsValid()) self.assertEqual(val.GetValueAsUnsigned(), 10001) - val = frame.EvaluateExpression("b"); + val = frame.EvaluateExpression("b") self.assertTrue(val.IsValid()) self.assertEqual(val.GetValueAsUnsigned(), 10002) - val = frame.EvaluateExpression("c"); + val = frame.EvaluateExpression("c") self.assertTrue(val.IsValid()) self.assertEqual(val.GetValueAsUnsigned(), 10003) self.process.Continue() - self.assertTrue(self.process.GetState() == lldb.eStateStopped, PROCESS_STOPPED) - thread = lldbutil.get_stopped_thread(self.process, lldb.eStopReasonBreakpoint) + self.assertTrue( + self.process.GetState() == lldb.eStateStopped, + PROCESS_STOPPED) + thread = lldbutil.get_stopped_thread( + self.process, lldb.eStopReasonBreakpoint) self.assertTrue(thread.IsValid()) frame = thread.GetSelectedFrame() self.assertTrue(frame.IsValid()) - val = frame.EvaluateExpression("a"); + val = frame.EvaluateExpression("a") self.assertTrue(val.IsValid()) self.assertEqual(val.GetValueAsUnsigned(), 1) - val = frame.EvaluateExpression("b"); + val = frame.EvaluateExpression("b") self.assertTrue(val.IsValid()) self.assertEqual(val.GetValueAsUnsigned(), 2) - val = frame.EvaluateExpression("c"); + val = frame.EvaluateExpression("c") self.assertTrue(val.IsValid()) self.assertEqual(val.GetValueAsUnsigned(), 778899) @@ -88,77 +113,101 @@ class TestMembersAndLocalsWithSameName(TestBase): self._load_exe() # Set breakpoints - bp1 = self.target.BreakpointCreateBySourceRegex("Break 1", self.src_file_spec) - self.assertTrue(bp1.IsValid() and bp1.GetNumLocations() >= 1, VALID_BREAKPOINT) - bp5 = self.target.BreakpointCreateBySourceRegex("Break 5", self.src_file_spec) - self.assertTrue(bp5.IsValid() and bp5.GetNumLocations() >= 1, VALID_BREAKPOINT) - bp6 = self.target.BreakpointCreateBySourceRegex("Break 6", self.src_file_spec) - self.assertTrue(bp6.IsValid() and bp6.GetNumLocations() >= 1, VALID_BREAKPOINT) - bp7 = self.target.BreakpointCreateBySourceRegex("Break 7", self.src_file_spec) - self.assertTrue(bp7.IsValid() and bp7.GetNumLocations() >= 1, VALID_BREAKPOINT) + bp1 = self.target.BreakpointCreateBySourceRegex( + "Break 1", self.src_file_spec) + self.assertTrue( + bp1.IsValid() and bp1.GetNumLocations() >= 1, + VALID_BREAKPOINT) + bp5 = self.target.BreakpointCreateBySourceRegex( + "Break 5", self.src_file_spec) + self.assertTrue( + bp5.IsValid() and bp5.GetNumLocations() >= 1, + VALID_BREAKPOINT) + bp6 = self.target.BreakpointCreateBySourceRegex( + "Break 6", self.src_file_spec) + self.assertTrue( + bp6.IsValid() and bp6.GetNumLocations() >= 1, + VALID_BREAKPOINT) + bp7 = self.target.BreakpointCreateBySourceRegex( + "Break 7", self.src_file_spec) + self.assertTrue( + bp7.IsValid() and bp7.GetNumLocations() >= 1, + VALID_BREAKPOINT) # Launch the process - self.process = self.target.LaunchSimple(None, None, self.get_process_working_directory()) + self.process = self.target.LaunchSimple( + None, None, self.get_process_working_directory()) self.assertTrue(self.process.IsValid(), PROCESS_IS_VALID) - self.assertTrue(self.process.GetState() == lldb.eStateStopped, PROCESS_STOPPED) + self.assertTrue( + self.process.GetState() == lldb.eStateStopped, + PROCESS_STOPPED) self._test_globals() self.process.Continue() - self.assertTrue(self.process.GetState() == lldb.eStateStopped, PROCESS_STOPPED) - thread = lldbutil.get_stopped_thread(self.process, lldb.eStopReasonBreakpoint) + self.assertTrue( + self.process.GetState() == lldb.eStateStopped, + PROCESS_STOPPED) + thread = lldbutil.get_stopped_thread( + self.process, lldb.eStopReasonBreakpoint) self.assertTrue(thread.IsValid()) frame = thread.GetSelectedFrame() self.assertTrue(frame.IsValid()) - val = frame.EvaluateExpression("a"); + val = frame.EvaluateExpression("a") self.assertTrue(val.IsValid()) self.assertEqual(val.GetValueAsUnsigned(), 12345) - val = frame.EvaluateExpression("b"); + val = frame.EvaluateExpression("b") self.assertTrue(val.IsValid()) self.assertEqual(val.GetValueAsUnsigned(), 54321) - val = frame.EvaluateExpression("c"); + val = frame.EvaluateExpression("c") self.assertTrue(val.IsValid()) self.assertEqual(val.GetValueAsUnsigned(), 34567) self.process.Continue() - self.assertTrue(self.process.GetState() == lldb.eStateStopped, PROCESS_STOPPED) - thread = lldbutil.get_stopped_thread(self.process, lldb.eStopReasonBreakpoint) + self.assertTrue( + self.process.GetState() == lldb.eStateStopped, + PROCESS_STOPPED) + thread = lldbutil.get_stopped_thread( + self.process, lldb.eStopReasonBreakpoint) self.assertTrue(thread.IsValid()) frame = thread.GetSelectedFrame() self.assertTrue(frame.IsValid()) - val = frame.EvaluateExpression("a"); + val = frame.EvaluateExpression("a") self.assertTrue(val.IsValid()) self.assertEqual(val.GetValueAsUnsigned(), 10001) - val = frame.EvaluateExpression("b"); + val = frame.EvaluateExpression("b") self.assertTrue(val.IsValid()) self.assertEqual(val.GetValueAsUnsigned(), 10002) - val = frame.EvaluateExpression("c"); + val = frame.EvaluateExpression("c") self.assertTrue(val.IsValid()) self.assertEqual(val.GetValueAsUnsigned(), 10003) self.process.Continue() - self.assertTrue(self.process.GetState() == lldb.eStateStopped, PROCESS_STOPPED) - thread = lldbutil.get_stopped_thread(self.process, lldb.eStopReasonBreakpoint) + self.assertTrue( + self.process.GetState() == lldb.eStateStopped, + PROCESS_STOPPED) + thread = lldbutil.get_stopped_thread( + self.process, lldb.eStopReasonBreakpoint) self.assertTrue(thread.IsValid()) frame = thread.GetSelectedFrame() self.assertTrue(frame.IsValid()) - val = frame.EvaluateExpression("a"); + val = frame.EvaluateExpression("a") self.assertTrue(val.IsValid()) self.assertEqual(val.GetValueAsUnsigned(), 1) - val = frame.EvaluateExpression("b"); + val = frame.EvaluateExpression("b") self.assertTrue(val.IsValid()) self.assertEqual(val.GetValueAsUnsigned(), 2) - val = frame.EvaluateExpression("c"); + val = frame.EvaluateExpression("c") self.assertTrue(val.IsValid()) self.assertEqual(val.GetValueAsUnsigned(), 778899) @@ -172,26 +221,27 @@ class TestMembersAndLocalsWithSameName(TestBase): self.assertTrue(self.src_file_spec.IsValid(), "breakpoint file") # Get the path of the executable - exe_path = os.path.join(cwd, 'a.out') + exe_path = os.path.join(cwd, 'a.out') # Load the executable self.target = self.dbg.CreateTarget(exe_path) self.assertTrue(self.target.IsValid(), VALID_TARGET) def _test_globals(self): - thread = lldbutil.get_stopped_thread(self.process, lldb.eStopReasonBreakpoint) + thread = lldbutil.get_stopped_thread( + self.process, lldb.eStopReasonBreakpoint) self.assertTrue(thread.IsValid()) frame = thread.GetSelectedFrame() self.assertTrue(frame.IsValid()) - val = frame.EvaluateExpression("a"); + val = frame.EvaluateExpression("a") self.assertTrue(val.IsValid()) self.assertEqual(val.GetValueAsUnsigned(), 112233) - val = frame.EvaluateExpression("b"); + val = frame.EvaluateExpression("b") self.assertTrue(val.IsValid()) self.assertEqual(val.GetValueAsUnsigned(), 445566) - val = frame.EvaluateExpression("c"); + val = frame.EvaluateExpression("c") self.assertTrue(val.IsValid()) self.assertEqual(val.GetValueAsUnsigned(), 778899) -- cgit v1.2.3