Fix tests after svn r256863 - can someone please commit?

[dawn]

Summary

This patch includes missed changes that should have gone in with r256863, but I can't get to svn at lldb.org at the moment (is it down?), so if someone else can, please commit these for me, and update http://reviews.llvm.org/D15593 to include the commit. Thanks!

Intended commit message was:

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

Differential Revision: http://reviews.llvm.org/D15593

lldb/trunk/packages/Python/lldbsuite/test/help/TestHelp.py

def test_help_image_du_sym_is_ambiguous(self):
         self.expect("help image du sym",
                     COMMAND_FAILED_AS_EXPECTED, error=True,
             substrs = ['error: ambiguous command image du sym',
                        'symfile',
                        'symtab'])
 
     @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):
         """Command 'help target variable' should display <variable-name> ..."""
         self.expect("help target variable",
             substrs = ['<variable-name> [<variable-name> [...]]'])
 
     @no_debug_info_test

lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py

def test_lldbmi_symbol_list_lines_file(self):
         # and last line, and making sure the other lines are under 29.
         sline = line_number('symbol_list_lines_inline_test.h', '// FUNC_ifunc')
         eline = line_number('symbol_list_lines_inline_test.h', '// FUNC_mfunc')
         self.runCmd("-symbol-list-lines symbol_list_lines_inline_test.h")
         self.expect("\^done,lines=\[\{pc=\"0x[0-9a-f]+\",line=\"%d\"\}(,\{pc=\"0x[0-9a-f]+\",line=\"\d\"\})*(,\{pc=\"0x[0-9a-f]+\",line=\"1\d\"\})*,\{pc=\"0x[0-9a-f]+\",line=\"%d\"\}(,\{pc=\"0x[0-9a-f]+\",line=\"2\d\"\})*\]" % (sline, eline))
 
         # 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
         path = os.path.join(os.getcwd(), "main.cpp")
         self.runCmd("-symbol-list-lines \"%s\"" % path)
         self.expect("\^done,lines=\[\{pc=\"0x0*%x\",line=\"%d\"\}(,\{pc=\"0x[0-9a-f]+\",line=\"\d+\"\})+\]" % (addr, line))
 
         # 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'\. \"")

lldb/trunk/tools/lldb-mi/MICmdCmdSymbol.cpp

 // Return:  bool - True = input was parsed successfully, false = input could not be parsed.
 // Throws:  None.
 //--
 static bool
 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);
 
     const bool ok = g_lineentry_header_regex.Execute(input, match);
     if (ok)
         file = match.GetMatchAtIndex(1);
     return ok;
 }