vendor/lldb/lldb-trunk-r338536vendor/lldb/lldb-release_70-r338892

31 files changed, 142 insertions, 99 deletions

diff --git a/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/TestBadAddressBreakpoints.py b/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/TestBadAddressBreakpoints.py
index 5014c1cd4a249..460e07ceadf00 100644
--- a/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/TestBadAddressBreakpoints.py
+++ b/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/TestBadAddressBreakpoints.py
@@ -31,7 +31,7 @@ class BadAddressBreakpointTestCase(TestBase):
     def address_breakpoints(self):
         """Test that breakpoints set on a bad address say they are bad."""
         target, process, thread, bkpt = \
-            lldbutil.run_to_source_breakpoint(self, 
+            lldbutil.run_to_source_breakpoint(self,
                                               "Set a breakpoint here",
                                               lldb.SBFileSpec("main.c"))
 
diff --git a/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/TestBreakpointAutoContinue.py b/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/TestBreakpointAutoContinue.py
index 0123e732e35d8..b5e38eec57937 100644
--- a/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/TestBreakpointAutoContinue.py
+++ b/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/TestBreakpointAutoContinue.py
@@ -34,17 +34,17 @@ class BreakpointAutoContinue(TestBase):
         self.build()
         self.auto_continue_location()
 
-    def make_target_and_bkpt(self, additional_options=None, num_expected_loc=1, 
+    def make_target_and_bkpt(self, additional_options=None, num_expected_loc=1,
                              pattern="Set a breakpoint here"):
         exe = self.getBuildArtifact("a.out")
         self.target = self.dbg.CreateTarget(exe)
         self.assertTrue(self.target.IsValid(), "Target is not valid")
-        
+
         extra_options_txt = "--auto-continue 1 "
         if additional_options:
             extra_options_txt += additional_options
-        bpno = lldbutil.run_break_set_by_source_regexp(self, pattern, 
-                                            extra_options = extra_options_txt, 
+        bpno = lldbutil.run_break_set_by_source_regexp(self, pattern,
+                                            extra_options = extra_options_txt,
                                             num_expected_locations = num_expected_loc)
         return bpno
 
diff --git a/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py b/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
index 7eb465f29599f..f4835a9b9c447 100644
--- a/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
+++ b/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
@@ -46,12 +46,12 @@ class BreakpointLocationsTestCase(TestBase):
         self.assertTrue(target, "Target %s is not valid"%(exe))
 
         # This should create a breakpoint with 3 locations.
-        
+
         bkpt = target.BreakpointCreateByLocation("main.c", self.line)
 
         # The breakpoint list should show 3 locations.
         self.assertEqual(bkpt.GetNumLocations(), 3, "Wrong number of locations")
-        
+
         self.expect(
             "breakpoint list -f",
             "Breakpoint locations shown correctly",
@@ -62,7 +62,7 @@ class BreakpointLocationsTestCase(TestBase):
                 "where = a.out`func_inlined .+unresolved, hit count = 0",
                 "where = a.out`main .+\[inlined\].+unresolved, hit count = 0"])
 
-        return bkpt        
+        return bkpt
 
     def shadowed_bkpt_cond_test(self):
         """Test that options set on the breakpoint and location behave correctly."""
@@ -106,7 +106,7 @@ class BreakpointLocationsTestCase(TestBase):
         commands = ["AAAAAA", "BBBBBB", "CCCCCC"]
         str_list = lldb.SBStringList()
         str_list.AppendList(commands, len(commands))
-        
+
         bkpt.SetCommandLineCommands(str_list)
         cmd_list = lldb.SBStringList()
         bkpt.GetCommandLineCommands(cmd_list)
@@ -123,7 +123,7 @@ class BreakpointLocationsTestCase(TestBase):
         bkpt.location[1].GetCommandLineCommands(loc_cmd_list)
 
         loc_list_size = loc_list.GetSize()
-        
+
         # Check that the location has the right commands:
         self.assertEqual(loc_cmd_list.GetSize() , loc_list_size, "Added the right number of commands to location")
         for i in range(0,loc_list_size):
diff --git a/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_names/TestBreakpointNames.py b/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_names/TestBreakpointNames.py
index 8b5352866c213..b36e915e22048 100644
--- a/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_names/TestBreakpointNames.py
+++ b/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_names/TestBreakpointNames.py
@@ -64,7 +64,7 @@ class BreakpointNames(TestBase):
         self.target = self.dbg.CreateTarget(exe)
         self.assertTrue(self.target, VALID_TARGET)
         self.main_file_spec = lldb.SBFileSpec(os.path.join(self.getSourceDir(), "main.c"))
-        
+
     def check_name_in_target(self, bkpt_name):
         name_list = lldb.SBStringList()
         self.target.GetBreakpointNames(name_list)
@@ -74,7 +74,7 @@ class BreakpointNames(TestBase):
                 found_it = True
                 break
         self.assertTrue(found_it, "Didn't find the name %s in the target's name list:"%(bkpt_name))
-       
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
@@ -107,14 +107,14 @@ class BreakpointNames(TestBase):
 
         matches = bkpt.MatchesName(bkpt_name)
         self.assertTrue(matches, "We didn't match the name we just set")
-        
+
         # Make sure we don't match irrelevant names:
         matches = bkpt.MatchesName("NotABreakpoint")
         self.assertTrue(not matches, "We matched a name we didn't set.")
 
         # Make sure the name is also in the target:
         self.check_name_in_target(bkpt_name)
- 
+
         # Add another name, make sure that works too:
         bkpt.AddName(other_bkpt_name)
 
@@ -132,7 +132,7 @@ class BreakpointNames(TestBase):
         bkpt.GetNames(name_list)
         num_names = name_list.GetSize()
         self.assertTrue(num_names == 1, "Name list has %d items, expected 1."%(num_names))
-        
+
         name = name_list.GetStringAtIndex(0)
         self.assertTrue(name == other_bkpt_name, "Remaining name was: %s expected %s."%(name, other_bkpt_name))
 
@@ -156,7 +156,7 @@ class BreakpointNames(TestBase):
 
     def do_check_using_names(self):
         """Use Python APIs to check names work in place of breakpoint ID's."""
-        
+
         bkpt = self.target.BreakpointCreateByLocation(self.main_file_spec, 10)
         bkpt_name = "ABreakpoint"
         other_bkpt_name= "_AnotherBreakpoint"
@@ -255,12 +255,12 @@ class BreakpointNames(TestBase):
         bp_name.SetAutoContinue(new_auto_continue)
         self.assertEqual(bp_name.GetAutoContinue(), new_auto_continue, "Couldn't change auto-continue on the name")
         self.assertEqual(bkpt.GetAutoContinue(), new_auto_continue, "Option didn't propagate to the breakpoint.")
-        
+
         # Now make this same breakpoint name - but from the command line
-        cmd_str = "breakpoint name configure %s -o %d -i %d -c '%s' -G %d -t %d -x %d -T '%s' -q '%s' -H '%s'"%(cl_bp_name_string, 
-                                                                             self.is_one_shot, 
-                                                                             self.ignore_count, 
-                                                                             self.condition, 
+        cmd_str = "breakpoint name configure %s -o %d -i %d -c '%s' -G %d -t %d -x %d -T '%s' -q '%s' -H '%s'"%(cl_bp_name_string,
+                                                                             self.is_one_shot,
+                                                                             self.ignore_count,
+                                                                             self.condition,
                                                                              self.auto_continue,
                                                                              self.tid,
                                                                              self.tidx,
@@ -269,7 +269,7 @@ class BreakpointNames(TestBase):
                                                                              self.help_string)
         for cmd in self.cmd_list:
             cmd_str += " -C '%s'"%(cmd)
-        
+
         self.runCmd(cmd_str, check=True)
         # Now look up this name again and check its options:
         cl_name = lldb.SBBreakpointName(self.target, cl_bp_name_string)
@@ -280,14 +280,14 @@ class BreakpointNames(TestBase):
         new_help = "I do something even more interesting"
         cl_name.SetHelpString(new_help)
         self.assertEqual(new_help, cl_name.GetHelpString(), "SetHelpString didn't")
-        
+
         # We should have three names now, make sure the target can list them:
         name_list = lldb.SBStringList()
         self.target.GetBreakpointNames(name_list)
         for name_string in [self.bp_name_string, other_bp_name_string, cl_bp_name_string]:
             self.assertTrue(name_string in name_list, "Didn't find %s in names"%(name_string))
 
-        # Delete the name from the current target.  Make sure that works and deletes the 
+        # Delete the name from the current target.  Make sure that works and deletes the
         # name from the breakpoint as well:
         self.target.DeleteBreakpointName(self.bp_name_string)
         name_list.Clear()
@@ -305,7 +305,7 @@ class BreakpointNames(TestBase):
         self.assertTrue(self.bp_name_string not in name_list, "Didn't delete %s from the dummy target"%(self.bp_name_string))
         # Also make sure the name got removed from breakpoints holding it:
         self.assertFalse(bkpt.MatchesName(self.bp_name_string), "Didn't remove the name from the breakpoint.")
-        
+
     def check_permission_results(self, bp_name):
         self.assertEqual(bp_name.GetAllowDelete(), False, "Didn't set allow delete.")
         protected_bkpt = self.target.BreakpointCreateByLocation(self.main_file_spec, 10)
diff --git a/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py b/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py
index 69dfac225258f..99b54329a0e15 100644
--- a/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py
+++ b/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py
@@ -25,7 +25,7 @@ class HardwareBreakpointMultiThreadTestCase(TestBase):
     @expectedFailureAndroid
     def test_hw_break_set_delete_multi_thread(self):
         self.build()
-        self.setTearDownCleanup() 
+        self.setTearDownCleanup()
         self.break_multi_thread('delete')
 
     # LLDB supports hardware breakpoints for arm and aarch64 architectures.
@@ -33,7 +33,7 @@ class HardwareBreakpointMultiThreadTestCase(TestBase):
     @expectedFailureAndroid
     def test_hw_break_set_disable_multi_thread(self):
         self.build()
-        self.setTearDownCleanup() 
+        self.setTearDownCleanup()
         self.break_multi_thread('disable')
 
     def setUp(self):
@@ -74,7 +74,7 @@ class HardwareBreakpointMultiThreadTestCase(TestBase):
         count = 0
 
         while count < 2 :
-         
+
             self.runCmd("process continue")
 
             # We should be stopped in hw_break_function
diff --git a/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py b/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py
index 5c3da17c254eb..c615278e8d480 100644
--- a/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py
+++ b/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py
@@ -65,7 +65,7 @@ class BreakpointSerialization(TestBase):
         # Create the targets we are making breakpoints in and copying them to:
         self.orig_target = self.dbg.CreateTarget(exe)
         self.assertTrue(self.orig_target, VALID_TARGET)
-        
+
         self.copy_target = self.dbg.CreateTarget(exe)
         self.assertTrue(self.copy_target, VALID_TARGET)
 
@@ -91,7 +91,7 @@ class BreakpointSerialization(TestBase):
         num_source_bps = source_bps.GetSize()
         num_copy_bps = copy_bps.GetSize()
         self.assertTrue(num_source_bps == num_copy_bps, "Didn't get same number of input and output breakpoints - orig: %d copy: %d"%(num_source_bps, num_copy_bps))
-        
+
         for i in range(0, num_source_bps):
             source_bp = source_bps.GetBreakpointAtIndex(i)
             source_desc = lldb.SBStream()
@@ -132,7 +132,7 @@ class BreakpointSerialization(TestBase):
         source_bps.Append(self.orig_target.BreakpointCreateByName("blubby", lldb.eFunctionNameTypeAuto, empty_module_list, empty_cu_list))
         source_bps.Append(self.orig_target.BreakpointCreateByName("blubby", lldb.eFunctionNameTypeFull, empty_module_list,empty_cu_list))
         source_bps.Append(self.orig_target.BreakpointCreateBySourceRegex("dont really care", blubby_file_spec))
-        
+
         # And some number greater than one:
         self.check_equivalence(source_bps)
 
@@ -185,7 +185,7 @@ class BreakpointSerialization(TestBase):
         bkpt.SetOneShot(True)
         bkpt.SetThreadID(10)
         source_bps.Append(bkpt)
-        
+
         # Make sure we get one right:
         self.check_equivalence(source_bps)
         source_bps.Clear()
@@ -232,7 +232,7 @@ class BreakpointSerialization(TestBase):
         bkpt.SetThreadID(10)
         source_bps.Append(bkpt)
         all_bps.Append(bkpt)
-        
+
         error = lldb.SBError()
         error = self.orig_target.BreakpointsWriteToFile(self.bkpts_file_spec, source_bps)
         self.assertTrue(error.Success(), "Failed writing breakpoints to file: %s."%(error.GetCString()))
@@ -265,7 +265,7 @@ class BreakpointSerialization(TestBase):
         write_bps = lldb.SBBreakpointList(self.orig_target)
         bkpt.AddName(good_bkpt_name)
         write_bps.Append(bkpt)
-        
+
         error = lldb.SBError()
         error = self.orig_target.BreakpointsWriteToFile(self.bkpts_file_spec, write_bps)
         self.assertTrue(error.Success(), "Failed writing breakpoints to file: %s."%(error.GetCString()))
@@ -282,7 +282,3 @@ class BreakpointSerialization(TestBase):
         error = self.copy_target.BreakpointsCreateFromFile(self.bkpts_file_spec, names_list, copy_bps)
         self.assertTrue(error.Success(), "Failed reading breakpoints from file: %s"%(error.GetCString()))
         self.assertTrue(copy_bps.GetSize() == 1, "Found the matching breakpoint.")
-        
-        
-        
-        
diff --git a/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py b/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py
index c2084295ef79d..07fd04940d96c 100644
--- a/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py
+++ b/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py
@@ -1,8 +1,8 @@
 """
 Test that breakpoints do not affect stepping.
-Check for correct StopReason when stepping to the line with breakpoint 
+Check for correct StopReason when stepping to the line with breakpoint
 which chould be eStopReasonBreakpoint in general,
-and eStopReasonPlanComplete when breakpoint's condition fails.  
+and eStopReasonPlanComplete when breakpoint's condition fails.
 """
 
 from __future__ import print_function
@@ -19,7 +19,7 @@ class StepOverBreakpointsTestCase(TestBase):
 
     def setUp(self):
         TestBase.setUp(self)
-       
+
         self.build()
         exe = self.getBuildArtifact("a.out")
         src = lldb.SBFileSpec("main.cpp")
@@ -32,7 +32,7 @@ class StepOverBreakpointsTestCase(TestBase):
         self.line1 = line_number('main.cpp', "breakpoint_1")
         self.line4 = line_number('main.cpp', "breakpoint_4")
 
-        self.breakpoint1 = self.target.BreakpointCreateByLocation(src, self.line1)        
+        self.breakpoint1 = self.target.BreakpointCreateByLocation(src, self.line1)
         self.assertTrue(
             self.breakpoint1 and self.breakpoint1.GetNumLocations() == 1,
             VALID_BREAKPOINT)
@@ -52,7 +52,7 @@ class StepOverBreakpointsTestCase(TestBase):
         self.thread = lldbutil.get_one_thread_stopped_at_breakpoint(self.process, self.breakpoint1)
         self.assertIsNotNone(self.thread, "Didn't stop at breakpoint 1.")
 
-    def test_step_instruction(self): 
+    def test_step_instruction(self):
         # Count instructions between breakpoint_1 and breakpoint_4
         contextList = self.target.FindFunctions('main', lldb.eFunctionNameTypeAuto)
         self.assertEquals(contextList.GetSize(), 1)
@@ -89,7 +89,7 @@ class StepOverBreakpointsTestCase(TestBase):
     @skipIf(bugnumber="llvm.org/pr31972", hostoslist=["windows"])
     def test_step_over(self):
         #lldb.DBG.EnableLog("lldb", ["step","breakpoint"])
-        
+
         self.thread.StepOver()
         # We should be stopped at the breakpoint_2 line with stop plan complete reason
         self.assertEquals(self.process.GetState(), lldb.eStateStopped)
diff --git a/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py b/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py
index a3b23834ee12a..5d4fcf64511b6 100644
--- a/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py
+++ b/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py
@@ -39,6 +39,46 @@ class CommandLineCompletionTestCase(TestBase):
         self.complete_from_to('de', 'detach ')
 
     @skipIfFreeBSD  # timing out on the FreeBSD buildbot
+    def test_frame_variable(self):
+        self.build()
+        self.main_source = "main.cpp"
+        self.main_source_spec = lldb.SBFileSpec(self.main_source)
+        self.dbg.CreateTarget(self.getBuildArtifact("a.out"))
+
+        (target, process, thread, bkpt) = lldbutil.run_to_source_breakpoint(self,
+                                          '// Break here', self.main_source_spec)
+        self.assertEquals(process.GetState(), lldb.eStateStopped)
+        # FIXME: This pulls in the debug information to make the completions work,
+        # but the completions should also work without.
+        self.runCmd("frame variable fooo")
+
+        self.complete_from_to('frame variable fo',
+                              'frame variable fooo')
+        self.complete_from_to('frame variable fooo.',
+                              'frame variable fooo.')
+        self.complete_from_to('frame variable fooo.dd',
+                              'frame variable fooo.dd')
+
+        self.complete_from_to('frame variable ptr_fooo->',
+                              'frame variable ptr_fooo->')
+        self.complete_from_to('frame variable ptr_fooo->dd',
+                              'frame variable ptr_fooo->dd')
+
+        self.complete_from_to('frame variable cont',
+                              'frame variable container')
+        self.complete_from_to('frame variable container.',
+                              'frame variable container.MemberVar')
+        self.complete_from_to('frame variable container.Mem',
+                              'frame variable container.MemberVar')
+
+        self.complete_from_to('frame variable ptr_cont',
+                              'frame variable ptr_container')
+        self.complete_from_to('frame variable ptr_container->',
+                              'frame variable ptr_container->MemberVar')
+        self.complete_from_to('frame variable ptr_container->Mem',
+                              'frame variable ptr_container->MemberVar')
+
+    @skipIfFreeBSD  # timing out on the FreeBSD buildbot
     def test_process_attach_dash_dash_con(self):
         """Test that 'process attach --con' completes to 'process attach --continue '."""
         self.complete_from_to(
@@ -261,7 +301,7 @@ class CommandLineCompletionTestCase(TestBase):
         common_match = match_strings.GetStringAtIndex(0)
         if num_matches == 0:
             compare_string = str_input
-        else: 
+        else:
             if common_match != None and len(common_match) > 0:
                 compare_string = str_input + common_match
             else:
@@ -273,8 +313,8 @@ class CommandLineCompletionTestCase(TestBase):
             if turn_off_re_match:
                 self.expect(
                     compare_string, msg=COMPLETION_MSG(
-                        str_input, p), exe=False, substrs=[p])
+                        str_input, p, match_strings), exe=False, substrs=[p])
             else:
                 self.expect(
                     compare_string, msg=COMPLETION_MSG(
-                        str_input, p), exe=False, patterns=[p])
+                        str_input, p, match_strings), exe=False, patterns=[p])
diff --git a/packages/Python/lldbsuite/test/functionalities/completion/main.cpp b/packages/Python/lldbsuite/test/functionalities/completion/main.cpp
index b408720d2cdc6..0814bb9cc0acf 100644
--- a/packages/Python/lldbsuite/test/functionalities/completion/main.cpp
+++ b/packages/Python/lldbsuite/test/functionalities/completion/main.cpp
@@ -7,8 +7,15 @@ public:
     }
 };
 
+struct Container { int MemberVar; };
+
 int main()
 {
-    Foo f;
-    f.Bar(1, 2);
+    Foo fooo;
+    Foo *ptr_fooo = &fooo;
+    fooo.Bar(1, 2);
+
+    Container container;
+    Container *ptr_container = &container;
+    return container.MemberVar = 3; // Break here
 }
diff --git a/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/TestDataFormatterLibcxxBitset.py b/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/TestDataFormatterLibcxxBitset.py
index 4fa115e516554..a0da4e41afef7 100644
--- a/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/TestDataFormatterLibcxxBitset.py
+++ b/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/TestDataFormatterLibcxxBitset.py
@@ -49,7 +49,7 @@ class TestDataFormatterLibcxxBitset(TestBase):
     def test_ptr_and_ref(self):
         """Test that ref and ptr to std::bitset is displayed correctly"""
         self.build()
-        (_, process, _, bkpt) = lldbutil.run_to_source_breakpoint(self, 
+        (_, process, _, bkpt) = lldbutil.run_to_source_breakpoint(self,
                 'Check ref and ptr',
                 lldb.SBFileSpec("main.cpp", False))
 
@@ -57,6 +57,6 @@ class TestDataFormatterLibcxxBitset(TestBase):
         self.check("ptr", 13)
 
         lldbutil.continue_to_breakpoint(process, bkpt)
-        
+
         self.check("ref", 200)
         self.check("ptr", 200)
diff --git a/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py b/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
index 5f48b3541e5ab..90a7e119fb846 100644
--- a/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
+++ b/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
@@ -90,7 +90,7 @@ class LibcxxListDataFormatterTestCase(TestBase):
 
         self.runCmd("n") # This gets up past the printf
         self.runCmd("n") # Now advance over the first push_back.
-        
+
         self.expect("frame variable numbers_list",
                     substrs=['list has 1 items',
                              '[0] = ',
diff --git a/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py b/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py
index 72a886ff12852..0732c03de837c 100644
--- a/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py
+++ b/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py
@@ -134,7 +134,7 @@ class LibcxxMultiSetDataFormatterTestCase(TestBase):
         """Test that the data formatters work on ref and ptr."""
         self.build()
         (self.target, process, _, bkpt) = lldbutil.run_to_source_breakpoint(
-            self, "Stop here to check by ref and ptr.", 
+            self, "Stop here to check by ref and ptr.",
             lldb.SBFileSpec("main.cpp", False))
         # The reference should print just like the value:
         self.check_ii("ref")
diff --git a/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py b/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py
index a6f1a3d2f4302..8d83f2b081f8e 100644
--- a/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py
+++ b/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py
@@ -130,7 +130,7 @@ class LibcxxSetDataFormatterTestCase(TestBase):
         """Test that the data formatters work on ref and ptr."""
         self.build()
         (self.target, process, _, bkpt) = lldbutil.run_to_source_breakpoint(
-            self, "Stop here to check by ref and ptr.", 
+            self, "Stop here to check by ref and ptr.",
             lldb.SBFileSpec("main.cpp", False))
         # The reference should print just like the value:
         self.check_ii("ref")
@@ -139,4 +139,4 @@ class LibcxxSetDataFormatterTestCase(TestBase):
                     substrs=["ptr =", "size=7"])
         self.expect("expr ptr",
                     substrs=["size=7"])
-                    
+
diff --git a/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py b/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
index aeb10984b3b87..237e27fe1f310 100644
--- a/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
+++ b/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
@@ -192,7 +192,7 @@ class LibcxxVectorDataFormatterTestCase(TestBase):
         self.check_numbers("ref")
 
         # The pointer should just show the right number of elements:
-        
+
         self.expect("frame variable ptr", substrs=['ptr =', ' size=7'])
 
         self.expect("p ptr", substrs=['$', 'size=7'])
diff --git a/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/TestDataFormatterStdTuple.py b/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/TestDataFormatterStdTuple.py
index c2e02f5466910..4f9047b84d0f9 100644
--- a/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/TestDataFormatterStdTuple.py
+++ b/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/TestDataFormatterStdTuple.py
@@ -40,7 +40,7 @@ class StdTupleDataFormatterTestCase(TestBase):
 
         self.assertEqual('"foobar"', frame.GetValueForVariablePath("ts[0]").GetSummary())
         self.assertFalse(frame.GetValueForVariablePath("ts[1]").IsValid())
-        
+
         self.assertEqual(1, frame.GetValueForVariablePath("tt[0]").GetValueAsUnsigned())
         self.assertEqual('"baz"', frame.GetValueForVariablePath("tt[1]").GetSummary())
         self.assertEqual(2, frame.GetValueForVariablePath("tt[2]").GetValueAsUnsigned())
diff --git a/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py b/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py
index 611869932b61d..8126a7ec750c9 100644
--- a/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py
+++ b/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py
@@ -96,7 +96,7 @@ class ExecTestCase(TestBase):
         if not skip_exec:
             self.assertTrue(process.GetState() == lldb.eStateStopped,
                             "Process should be stopped at __dyld_start")
-            
+
             threads = lldbutil.get_stopped_threads(
                 process, lldb.eStopReasonExec)
             self.assertTrue(
diff --git a/packages/Python/lldbsuite/test/functionalities/frame-language/TestGuessLanguage.py b/packages/Python/lldbsuite/test/functionalities/frame-language/TestGuessLanguage.py
index 59af2de836ffb..959b621521e94 100644
--- a/packages/Python/lldbsuite/test/functionalities/frame-language/TestGuessLanguage.py
+++ b/packages/Python/lldbsuite/test/functionalities/frame-language/TestGuessLanguage.py
@@ -18,7 +18,7 @@ class TestFrameGuessLanguage(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    # If your test case doesn't stress debug info, the 
+    # If your test case doesn't stress debug info, the
     # set this to true.  That way it won't be run once for
     # each debug info format.
     NO_DEBUG_INFO_TESTCASE = True
@@ -84,6 +84,6 @@ class TestFrameGuessLanguage(TestBase):
         self.check_language(thread, 0, c_frame_language)
         self.check_language(thread, 1, lldb.eLanguageTypeC_plus_plus)
         self.check_language(thread, 2, lldb.eLanguageTypeC_plus_plus)
-        
-        
+
+
 
diff --git a/packages/Python/lldbsuite/test/functionalities/frame_var/TestFrameVar.py b/packages/Python/lldbsuite/test/functionalities/frame_var/TestFrameVar.py
index 960891b9eefc5..b4e1b9c07634d 100644
--- a/packages/Python/lldbsuite/test/functionalities/frame_var/TestFrameVar.py
+++ b/packages/Python/lldbsuite/test/functionalities/frame_var/TestFrameVar.py
@@ -17,7 +17,7 @@ class TestFrameVar(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    # If your test case doesn't stress debug info, the 
+    # If your test case doesn't stress debug info, the
     # set this to true.  That way it won't be run once for
     # each debug info format.
     NO_DEBUG_INFO_TESTCASE = True
@@ -67,7 +67,7 @@ class TestFrameVar(TestBase):
         frame = threads[0].GetFrameAtIndex(0)
         command_result = lldb.SBCommandReturnObject()
         interp = self.dbg.GetCommandInterpreter()
-        
+
         # Just get args:
         result = interp.HandleCommand("frame var -l", command_result)
         self.assertEqual(result, lldb.eReturnStatusSuccessFinishResult, "frame var -a didn't succeed")
@@ -85,7 +85,7 @@ class TestFrameVar(TestBase):
         self.assertTrue("argv" not in output, "Locals found argv")
         self.assertTrue("test_var" in output, "Locals didn't find test_var")
         self.assertTrue("g_var" not in output, "Locals found a global")
-        
+
         # Get the file statics:
         result = interp.HandleCommand("frame var -l -a -g", command_result)
         self.assertEqual(result, lldb.eReturnStatusSuccessFinishResult, "frame var -a didn't succeed")
@@ -94,6 +94,6 @@ class TestFrameVar(TestBase):
         self.assertTrue("argv" not in output, "Globals found argv")
         self.assertTrue("test_var" not in output, "Globals found test_var")
         self.assertTrue("g_var" in output, "Globals didn't find g_var")
-        
-                        
+
+
 
diff --git a/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestTargetXMLArch.py b/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestTargetXMLArch.py
index ef9ce77009638..184867e480b41 100644
--- a/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestTargetXMLArch.py
+++ b/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestTargetXMLArch.py
@@ -98,12 +98,12 @@ class TestTargetXMLArch(GDBRemoteTestBase):
                 return "T05thread:00000001;06:9038d60f00700000;07:98b4062680ffffff;10:c0d7bf1b80ffffff;"
 
             def readRegister(self, register):
-                regs = {0x0: "00b0060000610000", 
-                        0xa: "68fe471c80ffffff", 
-                        0xc: "60574a1c80ffffff", 
-                        0xd: "18f3042680ffffff", 
-                        0xe: "be8a4d7142000000", 
-                        0xf: "50df471c80ffffff", 
+                regs = {0x0: "00b0060000610000",
+                        0xa: "68fe471c80ffffff",
+                        0xc: "60574a1c80ffffff",
+                        0xd: "18f3042680ffffff",
+                        0xe: "be8a4d7142000000",
+                        0xf: "50df471c80ffffff",
                         0x10: "c0d7bf1b80ffffff" }
                 if register in regs:
                     return regs[register]
diff --git a/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/gdbclientutils.py b/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/gdbclientutils.py
index ebafd405e23e8..d8d759a5dd58e 100644
--- a/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/gdbclientutils.py
+++ b/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/gdbclientutils.py
@@ -467,7 +467,7 @@ class GDBRemoteTestBase(TestBase):
         i = 0
         j = 0
         log = self.server.responder.packetLog
-        
+
         while i < len(packets) and j < len(log):
             if log[j] == packets[i]:
                 i += 1
diff --git a/packages/Python/lldbsuite/test/functionalities/history/TestHistoryRecall.py b/packages/Python/lldbsuite/test/functionalities/history/TestHistoryRecall.py
index 90bd64901ee5c..7956120bad327 100644
--- a/packages/Python/lldbsuite/test/functionalities/history/TestHistoryRecall.py
+++ b/packages/Python/lldbsuite/test/functionalities/history/TestHistoryRecall.py
@@ -17,7 +17,7 @@ class TestHistoryRecall(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    # If your test case doesn't stress debug info, the 
+    # If your test case doesn't stress debug info, the
     # set this to true.  That way it won't be run once for
     # each debug info format.
     NO_DEBUG_INFO_TESTCASE = True
@@ -35,7 +35,7 @@ class TestHistoryRecall(TestBase):
         result = lldb.SBCommandReturnObject()
         interp.HandleCommand("command history", result, True)
         interp.HandleCommand("platform list", result, True)
-        
+
         interp.HandleCommand("!0", result, False)
         self.assertTrue(result.Succeeded(), "!0 command did not work: %s"%(result.GetError()))
         self.assertTrue("command history" in result.GetOutput(), "!0 didn't rerun command history")
diff --git a/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py b/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py
index 6302112d2fe9e..ab5791c614af5 100644
--- a/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py
+++ b/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py
@@ -20,7 +20,7 @@ class LoadUnloadTestCase(TestBase):
     mydir = TestBase.compute_mydir(__file__)
 
     NO_DEBUG_INFO_TESTCASE = True
-   
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
@@ -210,7 +210,7 @@ class LoadUnloadTestCase(TestBase):
         if not self.platformIsDarwin():
             env_cmd_string += ":" + wd
         self.runCmd(env_cmd_string)
-        
+
         # This time, the hidden library should be picked up.
         self.expect("run", substrs=["return", "12345"])
 
diff --git a/packages/Python/lldbsuite/test/functionalities/load_using_paths/TestLoadUsingPaths.py b/packages/Python/lldbsuite/test/functionalities/load_using_paths/TestLoadUsingPaths.py
index 2050586adfa1b..a4d0a0b958d55 100644
--- a/packages/Python/lldbsuite/test/functionalities/load_using_paths/TestLoadUsingPaths.py
+++ b/packages/Python/lldbsuite/test/functionalities/load_using_paths/TestLoadUsingPaths.py
@@ -20,7 +20,7 @@ class LoadUsingPathsTestCase(TestBase):
     mydir = TestBase.compute_mydir(__file__)
 
     NO_DEBUG_INFO_TESTCASE = True
-   
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
@@ -52,8 +52,8 @@ class LoadUsingPathsTestCase(TestBase):
         # The directory with the dynamic library we did not link to.
         path_dir = os.path.join(self.getBuildDir(), "hidden")
 
-        (target, process, thread, 
-         _) = lldbutil.run_to_source_breakpoint(self, 
+        (target, process, thread,
+         _) = lldbutil.run_to_source_breakpoint(self,
                                                 "Break here to do the load using paths",
                                                 lldb.SBFileSpec("main.cpp"))
         error = lldb.SBError()
@@ -63,18 +63,18 @@ class LoadUsingPathsTestCase(TestBase):
         paths.AppendString(os.path.join(self.wd, "no_such_dir"))
 
         out_spec = lldb.SBFileSpec()
-        
+
         # First try with no correct directories on the path, and make sure that doesn't blow up:
         token = process.LoadImageUsingPaths(lib_spec, paths, out_spec, error)
         self.assertEqual(token, lldb.LLDB_INVALID_IMAGE_TOKEN, "Only looked on the provided path.")
-        
+
         # Now add the correct dir to the paths list and try again:
         paths.AppendString(self.hidden_dir)
         token = process.LoadImageUsingPaths(lib_spec, paths, out_spec, error)
 
         self.assertNotEqual(token, lldb.LLDB_INVALID_IMAGE_TOKEN, "Got a valid token")
         self.assertEqual(out_spec, lldb.SBFileSpec(self.hidden_lib), "Found the expected library")
-        
+
         # Make sure this really is in the image list:
         loaded_module = target.FindModule(out_spec)
 
@@ -89,11 +89,11 @@ class LoadUsingPathsTestCase(TestBase):
         # Make sure the token works to unload it:
         process.UnloadImage(token)
 
-        # Make sure this really is no longer in the image list: 
+        # Make sure this really is no longer in the image list:
         loaded_module = target.FindModule(out_spec)
 
         self.assertFalse(loaded_module.IsValid(), "The unloaded module is no longer in the image list.")
-        
+
         # Make sure a relative path also works:
         paths.Clear()
         paths.AppendString(os.path.join(self.wd, "no_such_dir"))
@@ -107,7 +107,7 @@ class LoadUsingPathsTestCase(TestBase):
         self.assertEqual(out_spec, lldb.SBFileSpec(self.hidden_lib), "Found the expected library with relative path")
 
         process.UnloadImage(token)
-        
+
         # Make sure the presence of an empty path doesn't mess anything up:
         paths.Clear()
         paths.AppendString("")
@@ -122,7 +122,7 @@ class LoadUsingPathsTestCase(TestBase):
         self.assertEqual(out_spec, lldb.SBFileSpec(self.hidden_lib), "Found the expected library with included empty path")
 
         process.UnloadImage(token)
-        
+
 
 
         # Finally, passing in an absolute path should work like the basename:
@@ -140,4 +140,4 @@ class LoadUsingPathsTestCase(TestBase):
         self.assertNotEqual(token, lldb.LLDB_INVALID_IMAGE_TOKEN, "Got a valid token")
         self.assertEqual(out_spec, lldb.SBFileSpec(self.hidden_lib), "Found the expected library")
 
-                                        
+
diff --git a/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/TestPreRunDylibs.py b/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/TestPreRunDylibs.py
index befb42186112c..65084211cd6d1 100644
--- a/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/TestPreRunDylibs.py
+++ b/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/TestPreRunDylibs.py
@@ -35,4 +35,4 @@ class TestPreRunLibraries(TestBase):
 
         self.assertTrue(found_it, "Couldn't find unlikely_to_occur_name in loaded libraries.")
 
-            
+
diff --git a/packages/Python/lldbsuite/test/functionalities/register/intel_avx/TestZMMRegister.py b/packages/Python/lldbsuite/test/functionalities/register/intel_avx/TestZMMRegister.py
index 823e40155ff5a..92c67c88f020f 100644
--- a/packages/Python/lldbsuite/test/functionalities/register/intel_avx/TestZMMRegister.py
+++ b/packages/Python/lldbsuite/test/functionalities/register/intel_avx/TestZMMRegister.py
@@ -81,7 +81,7 @@ class TestYMMRegister(TestBase):
             self.expect(
                 "register read ymm" + str(i),
                 substrs=[pattern])
-        
+
         self.expect("continue", PROCESS_STOPPED, substrs=['stopped'])
 
         # Check stop reason; Should be either signal SIGTRAP or EXC_BREAKPOINT
diff --git a/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py b/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py
index b7d0d8170b3bb..929bd4a735112 100644
--- a/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py
+++ b/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py
@@ -68,7 +68,7 @@ class ReturnValueTestCase(TestBase):
 
         # Run again and we will stop in inner_sint the second time outer_sint is called.
         # Then test stepping out two frames at once:
-        
+
         thread_list = lldbutil.continue_to_breakpoint(self.process, inner_sint_bkpt)
         self.assertTrue(len(thread_list) == 1)
         thread = thread_list[0]
diff --git a/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/TestCreateDuringStep.py b/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
index 3998db6d32563..9e30ba3e1345f 100644
--- a/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
+++ b/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
@@ -90,7 +90,7 @@ class CreateDuringStepTestCase(TestBase):
         target = self.dbg.GetSelectedTarget()
 
         # This should create a breakpoint in the stepping thread.
-        self.bkpt = target.BreakpointCreateByLocation("main.cpp", self.breakpoint) 
+        self.bkpt = target.BreakpointCreateByLocation("main.cpp", self.breakpoint)
 
         # Run the program.
         self.runCmd("run", RUN_SUCCEEDED)
diff --git a/packages/Python/lldbsuite/test/functionalities/thread/num_threads/TestNumThreads.py b/packages/Python/lldbsuite/test/functionalities/thread/num_threads/TestNumThreads.py
index 4c4e645635c16..724b9d8be9076 100644
--- a/packages/Python/lldbsuite/test/functionalities/thread/num_threads/TestNumThreads.py
+++ b/packages/Python/lldbsuite/test/functionalities/thread/num_threads/TestNumThreads.py
@@ -92,7 +92,7 @@ class NumberOfThreadsTestCase(TestBase):
         self.assertTrue(
             num_threads >= 10,
             'Number of expected threads and actual threads do not match.')
-        
+
         # Attempt to walk each of the thread's executing the thread3 function to
         # the same breakpoint.
         def is_thread3(thread):
diff --git a/packages/Python/lldbsuite/test/functionalities/thread/step_until/TestStepUntil.py b/packages/Python/lldbsuite/test/functionalities/thread/step_until/TestStepUntil.py
index 3bace5780639d..b0e7add37297e 100644
--- a/packages/Python/lldbsuite/test/functionalities/thread/step_until/TestStepUntil.py
+++ b/packages/Python/lldbsuite/test/functionalities/thread/step_until/TestStepUntil.py
@@ -61,7 +61,7 @@ class StepUntilTestCase(TestBase):
         cmd_line = "thread until"
         for line_num in until_lines:
             cmd_line += " %d"%(line_num)
- 
+
         cmd_interp.HandleCommand(cmd_line, ret_obj)
         self.assertTrue(ret_obj.Succeeded(), "'%s' failed: %s."%(cmd_line, ret_obj.GetError()))
 
diff --git a/packages/Python/lldbsuite/test/functionalities/watchpoint/multi_watchpoint_slots/TestWatchpointMultipleSlots.py b/packages/Python/lldbsuite/test/functionalities/watchpoint/multi_watchpoint_slots/TestWatchpointMultipleSlots.py
index b51cab38aa862..22dc19ed322ff 100644
--- a/packages/Python/lldbsuite/test/functionalities/watchpoint/multi_watchpoint_slots/TestWatchpointMultipleSlots.py
+++ b/packages/Python/lldbsuite/test/functionalities/watchpoint/multi_watchpoint_slots/TestWatchpointMultipleSlots.py
@@ -85,7 +85,7 @@ class WatchpointSlotsTestCase(TestBase):
         # Set a watchpoint at byteArray[3]
         self.expect("watchpoint set variable byteArray[3]", WATCHPOINT_CREATED,
                     substrs=['Watchpoint created','size = 1'])
-   
+
         # Resume inferior.
         self.runCmd("process continue")
 
@@ -98,6 +98,6 @@ class WatchpointSlotsTestCase(TestBase):
         else:
             self.expect("thread list -v", STOPPED_DUE_TO_WATCHPOINT,
                         substrs=['stopped', 'stop reason = watchpoint 3'])
-   
+
         # Resume inferior.
         self.runCmd("process continue")
diff --git a/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_disable/TestWatchpointDisable.py b/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_disable/TestWatchpointDisable.py
index 587dcabb2ba39..ea4f06218a0da 100644
--- a/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_disable/TestWatchpointDisable.py
+++ b/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_disable/TestWatchpointDisable.py
@@ -65,9 +65,9 @@ class TestWatchpointSetEnable(TestBase):
 
         wp.SetEnabled(False)
         self.assertTrue(not wp.IsEnabled(), "The watchpoint thinks it is still enabled")
-        
+
         process.Continue()
-        
+
         stop_reason = thread.GetStopReason()
 
         self.assertEqual(stop_reason, lldb.eStopReasonBreakpoint, "We didn't stop at our breakpoint.")
@@ -78,4 +78,4 @@ class TestWatchpointSetEnable(TestBase):
             process.Continue()
             stop_reason = thread.GetStopReason()
             self.assertEqual(stop_reason, lldb.eStopReasonWatchpoint, "We didn't stop at our watchpoint")
-        
+