[Lldb-commits] [PATCH] D15904: Fix tests after svn r256863 - can someone please commit?

[Dawn Perchik via lldb-commits]

dawn created this revision.
dawn added a reviewer: lldb-commits.
dawn added a subscriber: lldb-commits.
dawn set the repository for this revision to rL LLVM.

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

Repository:
  rL LLVM

http://reviews.llvm.org/D15904

Files:
  packages/Python/lldbsuite/test/help/TestHelp.py
  packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py
  tools/lldb-mi/MICmdCmdSymbol.cpp

Index: tools/lldb-mi/MICmdCmdSymbol.cpp
===================================================================
--- tools/lldb-mi/MICmdCmdSymbol.cpp
+++ tools/lldb-mi/MICmdCmdSymbol.cpp
@@ -106,8 +106,8 @@
 {
     // 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);
 
Index: packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py
===================================================================
--- packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py
+++ packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py
@@ -63,11 +63,11 @@
 
         # 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 @@
 
         # 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'\. \"")
Index: packages/Python/lldbsuite/test/help/TestHelp.py
===================================================================
--- packages/Python/lldbsuite/test/help/TestHelp.py
+++ packages/Python/lldbsuite/test/help/TestHelp.py
@@ -134,10 +134,10 @@
 
     @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):


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D15904.44061.patch
Type: text/x-patch
Size: 3092 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20160105/41522875/attachment.bin>