Apply missed changes from svn r256863 "Add support for "source info" and use it to fix MI's -symbol-list-lines.".

Patch is part of Differential Revision: http://reviews.llvm.org/D15593
Differential Revision: http://reviews.llvm.org/D15904

llvm-svn: 256877

2 files changed, 5 insertions, 5 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/help/TestHelp.py b/lldb/packages/Python/lldbsuite/test/help/TestHelp.py
index 783cbff4c1c..f51b6aa59f1 100644
--- a/lldb/packages/Python/lldbsuite/test/help/TestHelp.py
+++ b/lldb/packages/Python/lldbsuite/test/help/TestHelp.py
@@ -134,10 +134,10 @@ class HelpCommandTestCase(TestBase):
 
     @no_debug_info_test
     def test_help_image_du_line_should_work(self):
-        """Command 'help image du line' is not ambiguous and should work."""
+        """Command 'help image du line-table' is not ambiguous and should work."""
         # 'image' is an alias for 'target modules'.
         self.expect("help image du line",
-            substrs = ['Dump the line table for one or more files'])
+            substrs = ['Dump the line table for one or more compilation units'])
 
     @no_debug_info_test
     def test_help_target_variable_syntax(self):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py
index f05c6712f80..fc875e86fe8 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py
@@ -63,11 +63,11 @@ class MiSymbolTestCase(lldbmi_testcase.MiTestCaseBase):
 
         # Test that -symbol-list-lines fails when file doesn't exist
         self.runCmd("-symbol-list-lines unknown_file")
-        self.expect("\^error,message=\"warning: No source filenames matched 'unknown_file'\. error: no source filenames matched any command arguments \"")
+        self.expect("\^error,message=\"error: No source filenames matched 'unknown_file'\. \"")
 
         # Test that -symbol-list-lines fails when file is specified using relative path
         self.runCmd("-symbol-list-lines ./main.cpp")
-        self.expect("\^error,message=\"warning: No source filenames matched '\./main\.cpp'\. error: no source filenames matched any command arguments \"")
+        self.expect("\^error,message=\"error: No source filenames matched '\./main\.cpp'\. \"")
 
         # Test that -symbol-list-lines works when file is specified using absolute path
         import os
@@ -77,4 +77,4 @@ class MiSymbolTestCase(lldbmi_testcase.MiTestCaseBase):
 
         # Test that -symbol-list-lines fails when file doesn't exist
         self.runCmd("-symbol-list-lines unknown_dir/main.cpp")
-        self.expect("\^error,message=\"warning: No source filenames matched 'unknown_dir/main\.cpp'\. error: no source filenames matched any command arguments \"")
+        self.expect("\^error,message=\"error: No source filenames matched 'unknown_dir/main\.cpp'\. \"")