Author: dperchik Date: Tue Jan 5 18:03:43 2016 New Revision: 256877 URL: http://llvm.org/viewvc/llvm-project?rev=256877&view=rev Log: 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 Modified: lldb/trunk/packages/Python/lldbsuite/test/help/TestHelp.py lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py lldb/trunk/tools/lldb-mi/MICmdCmdSymbol.cpp Modified: lldb/trunk/packages/Python/lldbsuite/test/help/TestHelp.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/help/TestHelp.py?rev=256877&r1=256876&r2=256877&view=diff ============================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/help/TestHelp.py (original) +++ lldb/trunk/packages/Python/lldbsuite/test/help/TestHelp.py Tue Jan 5 18:03:43 2016 @@ -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): Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py?rev=256877&r1=256876&r2=256877&view=diff ============================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py (original) +++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py Tue Jan 5 18:03:43 2016 @@ -63,11 +63,11 @@ class MiSymbolTestCase(lldbmi_testcase.M # 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.M # 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'\. \"") Modified: lldb/trunk/tools/lldb-mi/MICmdCmdSymbol.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdCmdSymbol.cpp?rev=256877&r1=256876&r2=256877&view=diff ============================================================================== --- lldb/trunk/tools/lldb-mi/MICmdCmdSymbol.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmdCmdSymbol.cpp Tue Jan 5 18:03:43 2016 @@ -106,8 +106,8 @@ ParseLLDBLineAddressHeader(const char *i { // 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); _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
