diff options
| -rw-r--r-- | lldb/source/Commands/CommandObjectHelp.cpp | 4 | ||||
| -rw-r--r-- | lldb/test/help/TestHelp.py | 8 | ||||
| -rw-r--r-- | lldb/test/lldbtest.py | 1 | ||||
| -rw-r--r-- | lldb/test/stl/TestStdCXXDisassembly.py | 2 |
4 files changed, 13 insertions, 2 deletions
diff --git a/lldb/source/Commands/CommandObjectHelp.cpp b/lldb/source/Commands/CommandObjectHelp.cpp index ff666398638..c7aa2b4f1a7 100644 --- a/lldb/source/Commands/CommandObjectHelp.cpp +++ b/lldb/source/Commands/CommandObjectHelp.cpp @@ -121,6 +121,8 @@ CommandObjectHelp::Execute (Args& command, CommandReturnObject &result) if ((long_help != NULL) && (strlen (long_help) > 0)) output_strm.Printf ("\n%s", long_help); + // Mark this help command with a success status. + result.SetStatus (eReturnStatusSuccessFinishNoResult); } else if (sub_cmd_obj->IsMultiwordObject()) { @@ -149,6 +151,8 @@ CommandObjectHelp::Execute (Args& command, CommandReturnObject &result) else m_interpreter.OutputFormattedHelpText (output_strm, "", "", sub_cmd_obj->GetHelp(), 1); output_strm.Printf ("\nSyntax: %s\n", sub_cmd_obj->GetSyntax()); + // Mark this help command with a success status. + result.SetStatus (eReturnStatusSuccessFinishNoResult); } } } diff --git a/lldb/test/help/TestHelp.py b/lldb/test/help/TestHelp.py index 49d857aa660..84b1eb0d302 100644 --- a/lldb/test/help/TestHelp.py +++ b/lldb/test/help/TestHelp.py @@ -1,5 +1,5 @@ """ -Test lldb help command. +Test some lldb help commands. See also CommandInterpreter::OutputFormattedHelpText(). """ @@ -24,6 +24,12 @@ class HelpCommandTestCase(TestBase): self.expect("help", startstr = 'The following is a list of built-in, permanent debugger commands') + def test_help_image_dump_symtab_should_not_crash(self): + """Command 'help image dump symtab' should not crash lldb.""" + self.expect("help image dump symtab", + substrs = ['image dump symtab', + 'sort-order']) + if __name__ == '__main__': import atexit diff --git a/lldb/test/lldbtest.py b/lldb/test/lldbtest.py index 3876cae3666..2d02d11b1d7 100644 --- a/lldb/test/lldbtest.py +++ b/lldb/test/lldbtest.py @@ -392,6 +392,7 @@ class TestBase(unittest2.TestCase): if self.res.Succeeded(): print >> sys.stderr, "output:", self.res.GetOutput() else: + print >> sys.stderr, "runCmd failed!" print >> sys.stderr, self.res.GetError() if running: diff --git a/lldb/test/stl/TestStdCXXDisassembly.py b/lldb/test/stl/TestStdCXXDisassembly.py index 93849607e72..e47c3c97b08 100644 --- a/lldb/test/stl/TestStdCXXDisassembly.py +++ b/lldb/test/stl/TestStdCXXDisassembly.py @@ -33,7 +33,7 @@ class StdCXXDisassembleTestCase(TestBase): # The process should be in a 'Stopped' state. self.expect(repr(process), STOPPED_DUE_TO_BREAKPOINT, exe=False, substrs = ["a.out", - "state: Stopped"]) + "Stopped"]) # Disassemble the functions on the call stack. self.runCmd("thread backtrace") |
