Fix AbbreviationsTestCase, AliasTestCase and HelpCommandTestCase tests after r226068

[ki.stfu]

Summary

This patch fixes the following cases:

1. test_nonrunning_command_abbreviations (TestAbbreviations.AbbreviationsTestCase):

$ ./dotest.py -v --executable $BUILDDIR/bin/lldb -f AbbreviationsTestCase.test_nonrunning_command_abbreviations
['./dotest.py', '-v', '--executable', '/Users/IliaK/p/llvm/build_ninja/bin/lldb', '-f', 'AbbreviationsTestCase.test_nonrunning_command_abbreviations']
LLDB library dir: /Users/IliaK/p/llvm/build_ninja/bin
lldb-330.99.0
lldb.pre_flight: None
lldb.post_flight: None

Session logs for test failures/errors/unexpected successes will go into directory '2015-01-20-16_17_43'
Command invoked: ./dotest.py -v --executable /Users/IliaK/p/llvm/build_ninja/bin/lldb -f AbbreviationsTestCase.test_nonrunning_command_abbreviations
compilers=['clang']

Configuration: arch=x86_64 compiler=clang
----------------------------------------------------------------------
Collected 1 test

1: test_nonrunning_command_abbreviations (TestAbbreviations.AbbreviationsTestCase) ... FAILURE

======================================================================
FAIL: test_nonrunning_command_abbreviations (TestAbbreviations.AbbreviationsTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/IliaK/p/llvm/tools/lldb/test/functionalities/abbreviation/TestAbbreviations.py", line 37, in test_nonrunning_command_abbreviations
    startstr = "The following is a list of built-in, permanent debugger commands:")
  File "/Users/IliaK/p/llvm/tools/lldb/test/lldbtest.py", line 2011, in expect
    msg if msg else EXP_MSG(str, exe))
AssertionError: False is not True : 'h' returns expected result
Config=x86_64-clang
----------------------------------------------------------------------
Ran 1 test in 0.966s

FAILED (failures=1)
Session logs for test failures/errors/unexpected successes can be found in directory '2015-01-20-16_17_43'

2. test_with_dsym (TestAliases.AliasTestCase):

======================================================================
FAIL: test_with_dsym (TestAliases.AliasTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/IliaK/p/llvm/tools/lldb/test/lldbtest.py", line 382, in wrapper
    return func(self, *args, **kwargs)
  File "/Users/IliaK/p/llvm/tools/lldb/test/functionalities/alias/TestAliases.py", line 19, in test_with_dsym
    self.alias_tests ()
  File "/Users/IliaK/p/llvm/tools/lldb/test/functionalities/alias/TestAliases.py", line 118, in alias_tests
    substrs = [ 'run', 'process launch -c /bin/sh' ])
  File "/Users/IliaK/p/llvm/tools/lldb/test/lldbtest.py", line 2011, in expect
    msg if msg else EXP_MSG(str, exe))
AssertionError: False is not True : 'process launch -c /bin/sh' returns expected result
Config=x86_64-clang
----------------------------------------------------------------------
Ran 1 test in 0.747s

FAILED (failures=1)

3. test_with_dwarf (TestAliases.AliasTestCase):

======================================================================
FAIL: test_with_dwarf (TestAliases.AliasTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/IliaK/p/llvm/tools/lldb/test/lldbtest.py", line 399, in wrapper
    return func(self, *args, **kwargs)
  File "/Users/IliaK/p/llvm/tools/lldb/test/functionalities/alias/TestAliases.py", line 24, in test_with_dwarf
    self.alias_tests ()
  File "/Users/IliaK/p/llvm/tools/lldb/test/functionalities/alias/TestAliases.py", line 118, in alias_tests
    substrs = [ 'run', 'process launch -c /bin/sh' ])
  File "/Users/IliaK/p/llvm/tools/lldb/test/lldbtest.py", line 2011, in expect
    msg if msg else EXP_MSG(str, exe))
AssertionError: False is not True : 'process launch -c /bin/sh' returns expected result
Config=x86_64-clang
----------------------------------------------------------------------
Ran 1 test in 0.741s

FAILED (failures=1)

4. test_help_on_help (TestHelp.HelpCommandTestCase)
5. test_help_should_not_hang_emacsshell (TestHelp.HelpCommandTestCase)
6. test_simplehelp (TestHelp.HelpCommandTestCase)

These bugs were introduced by r226068 - Three related changes to help.

[emaste]

This comment was removed by emaste.

[ki.stfu]

Fix AliasTestCase tests.

[ki.stfu]

This comment was removed by ki.stfu.

[ki.stfu]

Fix HelpCommandTestCase tests.

BTW, I don't have the write access yet. Could somebody commit it?

lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py

def test_nonrunning_command_abbreviations (self):
                     substrs = ['Syntax: target create <cmd-options> <filename>'])
         self.runCmd("com u gurp")
         self.expect("gurp",
                     COMMAND_FAILED_AS_EXPECTED, error = True,
                     substrs = ["error: 'gurp' is not a valid command."])
 
         # Only one matching command: execute it.
         self.expect("h",
-                    startstr = "The following is a list of built-in, permanent debugger commands:")
+                    startstr = "Debugger commands:")
 
         # Execute cleanup function during test tear down
         def cleanup():
             self.runCmd("command alias t thread select")
         self.addTearDownHook(cleanup)
 
         # Several matching commands: list them and error out.
         self.runCmd("command unalias t")

lldb/trunk/test/functionalities/alias/TestAliases.py

#                     substrs = [ "hello" ])
 
 
         self.expect ("help run",
                      substrs = [ "'run' is an abbreviation for 'process launch -c /bin/sh --'" ])
 
         self.expect ("help -a run",
                      substrs = [ "'run' is an abbreviation for 'process launch -c /bin/sh --'" ])
 
-        self.expect ("help -a",
+        self.expect ("help",
                      substrs = [ 'run', 'process launch -c /bin/sh' ])
 
-        self.expect ("help", matching=False,
+        self.expect ("help -a", matching=False,
                      substrs = [ "'run'", 'process launch -c /bin/sh' ])
 
         self.expect ("run",
                      patterns = [ "Process .* launched: .*a.out" ])
 
         self.expect (r'''expression (int) printf("\x68\x65\x6c\x6c\x6f\n")''',
                      substrs = [ "(int) $",
                                  "= 6" ])

lldb/trunk/test/help/TestHelp.py

 
 class HelpCommandTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
     def test_simplehelp(self):
         """A simple test of 'help' command and its output."""
         self.expect("help",
-            startstr = 'The following is a list of built-in, permanent debugger commands')
+            startstr = 'Debugger commands:')
 
-        self.expect("help", matching=False,
+        self.expect("help -a", matching=False,
                     substrs = ['next'])
         
-        self.expect("help -a", matching=True,
+        self.expect("help", matching=True,
                     substrs = ['next'])
     
     def test_help_on_help(self):
         """Testing the help on the help facility."""
         self.expect("help help", matching=True,
-                    substrs = ['--show-aliases',
+                    substrs = ['--hide-aliases',
                                '--hide-user-commands'])
 
     def version_number_string(self):
         """Helper function to find the version number string of lldb."""
         plist = os.path.join(os.environ["LLDB_SRC"], "resources", "LLDB-Info.plist")
         try:
             CFBundleVersionSegFound = False
             with open(plist, 'r') as f:
class HelpCommandTestCase(TestBase):
 
     def test_help_should_not_hang_emacsshell(self):
         """Command 'settings set term-width 0' should not hang the help command."""
         self.expect("settings set term-width 0",
                     COMMAND_FAILED_AS_EXPECTED, error=True,
             substrs = ['error: 0 is out of range, valid values must be between'])
         # self.runCmd("settings set term-width 0")
         self.expect("help",
-            startstr = 'The following is a list of built-in, permanent debugger commands')
+            startstr = 'Debugger commands:')
 
     def test_help_breakpoint_set(self):
         """Test that 'help breakpoint set' does not print out redundant lines of:
         'breakpoint set [-s <shlib-name>] ...'."""
         self.expect("help breakpoint set", matching=False,
             substrs = ['breakpoint set [-s <shlib-name>]'])
 
     def test_help_image_dump_symtab_should_not_crash(self):