[Test] Fix up tests affected by the new LLVM header.

The new LLVM header is one line shorter than the old one, which lead to
some test failures. Ideally tests should rely on line numbers for
breakpoints or output, but that's a different discussion. Hopefully this
turns the bots green again.

llvm-svn: 351779

3 files changed, 12 insertions, 12 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py
index 07032cc0380..f06fb07b3bf 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py
@@ -24,12 +24,12 @@ class BreakpointByLineAndColumnTestCase(TestBase):
         self.build()
         main_c = lldb.SBFileSpec("main.c")
         _, _, _, breakpoint = lldbutil.run_to_line_breakpoint(self,
-                                                              main_c, 20, 50)
+                                                              main_c, 19, 50)
         self.expect("fr v did_call", substrs='1')
         in_then = False
         for i in range(breakpoint.GetNumLocations()):
             b_loc = breakpoint.GetLocationAtIndex(i).GetAddress().GetLineEntry()
-            self.assertEqual(b_loc.GetLine(), 20)
+            self.assertEqual(b_loc.GetLine(), 19)
             in_then |= b_loc.GetColumn() == 50
         self.assertTrue(in_then)
 
@@ -38,11 +38,11 @@ class BreakpointByLineAndColumnTestCase(TestBase):
     def testBreakpointByLine(self):
         self.build()
         main_c = lldb.SBFileSpec("main.c")
-        _, _, _, breakpoint = lldbutil.run_to_line_breakpoint(self, main_c, 20)
+        _, _, _, breakpoint = lldbutil.run_to_line_breakpoint(self, main_c, 19)
         self.expect("fr v did_call", substrs='0')
         in_condition = False
         for i in range(breakpoint.GetNumLocations()):
             b_loc = breakpoint.GetLocationAtIndex(i).GetAddress().GetLineEntry()
-            self.assertEqual(b_loc.GetLine(), 20)
+            self.assertEqual(b_loc.GetLine(), 19)
             in_condition |= b_loc.GetColumn() < 30
         self.assertTrue(in_condition)
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/TestLibCxxFunction.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/TestLibCxxFunction.py
index e44ea61d120..0254bf54d91 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/TestLibCxxFunction.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/TestLibCxxFunction.py
@@ -44,13 +44,13 @@ class LibCxxFunctionTestCase(TestBase):
                     substrs=['f1 =  Function = foo(int, int)'])
 
         self.expect("frame variable f2",
-                    substrs=['f2 =  Lambda in File main.cpp at Line 27'])
+                    substrs=['f2 =  Lambda in File main.cpp at Line 26'])
 
         self.expect("frame variable f3",
-                    substrs=['f3 =  Lambda in File main.cpp at Line 31'])
+                    substrs=['f3 =  Lambda in File main.cpp at Line 30'])
 
         self.expect("frame variable f4",
-                    substrs=['f4 =  Function in File main.cpp at Line 17'])
+                    substrs=['f4 =  Function in File main.cpp at Line 16'])
 
         self.expect("frame variable f5",
                     substrs=['f5 =  Function = Bar::add_num(int) const'])
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/TestObjCExceptions.py b/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/TestObjCExceptions.py
index 92b32504cf2..aa64606968f 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/TestObjCExceptions.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/TestObjCExceptions.py
@@ -37,7 +37,7 @@ class ObjCExceptionsTestCase(TestBase):
         target = self.dbg.GetSelectedTarget()
         thread = target.GetProcess().GetSelectedThread()
         frame = thread.GetSelectedFrame()
-        
+
         opts = lldb.SBVariablesOptions()
         opts.SetIncludeRecognizedArguments(True)
         variables = frame.GetVariables(opts)
@@ -142,8 +142,8 @@ class ObjCExceptionsTestCase(TestBase):
                 '(NSException *) exception = ',
                 'name: "ThrownException" - reason: "SomeReason"',
                 'libobjc.A.dylib`objc_exception_throw',
-                'a.out`foo', 'at main.mm:25',
-                'a.out`rethrow', 'at main.mm:36',
+                'a.out`foo', 'at main.mm:24',
+                'a.out`rethrow', 'at main.mm:35',
                 'a.out`main',
             ])
 
@@ -169,8 +169,8 @@ class ObjCExceptionsTestCase(TestBase):
         self.expect('thread exception', substrs=[
                 '(MyCustomException *) exception = ',
                 'libobjc.A.dylib`objc_exception_throw',
-                'a.out`foo', 'at main.mm:27',
-                'a.out`rethrow', 'at main.mm:36',
+                'a.out`foo', 'at main.mm:26',
+                'a.out`rethrow', 'at main.mm:35',
                 'a.out`main',
             ])