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

Dawn Perchik · Dawn Perchik · commit 07ac14fa4876 · 2016-01-06T00:03:43.000Z
Patch is part of Differential Revision: http://reviews.llvm.org/D15593 Differential Revision: http://reviews.llvm.org/D15904 llvm-svn: 256877
diff --git a/lldb/packages/Python/lldbsuite/test/help/TestHelp.py b/lldb/packages/Python/lldbsuite/test/help/TestHelp.py
@@ -134,10 +134,10 @@ def test_help_image_du_sym_is_ambiguous(self):
 
     @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
@@ -63,11 +63,11 @@ def test_lldbmi_symbol_list_lines_file(self):
 
         # 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 @@ def test_lldbmi_symbol_list_lines_file(self):
 
         # 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'\. \"")
diff --git a/lldb/tools/lldb-mi/MICmdCmdSymbol.cpp b/lldb/tools/lldb-mi/MICmdCmdSymbol.cpp
@@ -106,8 +106,8 @@ ParseLLDBLineAddressHeader(const char *input, CMIUtilString &file)
 {
     // Match LineEntry using regex.
     static MIUtilParse::CRegexParser g_lineentry_header_regex( 
-        "^ *Lines for file (.+) in compilation unit (.+) in `(.+)$");
-        //                 ^1=file                  ^2=cu    ^3=module
+        "^ *Lines found for file (.+) in compilation unit (.+) in `(.+)$");
+        //                       ^1=file                  ^2=cu    ^3=module
 
     MIUtilParse::CRegexParser::Match match(4);
 

Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,8 @@ ParseLLDBLineAddressHeader(const char *input, CMIUtilString &file)`
`106`	`106`	`{`
`107`	`107`	`// Match LineEntry using regex.`
`108`	`108`	`static MIUtilParse::CRegexParser g_lineentry_header_regex(`
`109`		- "^ *Lines for file (.+) in compilation unit (.+) in `(.+)$");
`110`		`- // ^1=file ^2=cu ^3=module`
	`109`	+ "^ *Lines found for file (.+) in compilation unit (.+) in `(.+)$");
	`110`	`+ // ^1=file ^2=cu ^3=module`
`111`	`111`
`112`	`112`	`MIUtilParse::CRegexParser::Match match(4);`
`113`	`113`