[Lldb-commits] [lldb] r226568 - Fix help test cases after r226068

[Ed Maste]

Author: emaste
Date: Tue Jan 20 09:13:01 2015
New Revision: 226568

URL: http://llvm.org/viewvc/llvm-project?rev=226568&view=rev
Log:
Fix help test cases after r226068

From: Ilia K <ki.stfu at gmail.com>
Differential Revision: http://reviews.llvm.org/D7066

Modified:
    lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py
    lldb/trunk/test/functionalities/alias/TestAliases.py
    lldb/trunk/test/help/TestHelp.py

Modified: lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py?rev=226568&r1=226567&r2=226568&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py (original)
+++ lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py Tue Jan 20 09:13:01 2015
@@ -34,7 +34,7 @@ class AbbreviationsTestCase(TestBase):
 
         # 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():

Modified: lldb/trunk/test/functionalities/alias/TestAliases.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/alias/TestAliases.py?rev=226568&r1=226567&r2=226568&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/alias/TestAliases.py (original)
+++ lldb/trunk/test/functionalities/alias/TestAliases.py Tue Jan 20 09:13:01 2015
@@ -114,10 +114,10 @@ class AliasTestCase(TestBase):
         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",

Modified: lldb/trunk/test/help/TestHelp.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/help/TestHelp.py?rev=226568&r1=226567&r2=226568&view=diff
==============================================================================
--- lldb/trunk/test/help/TestHelp.py (original)
+++ lldb/trunk/test/help/TestHelp.py Tue Jan 20 09:13:01 2015
@@ -16,18 +16,18 @@ class HelpCommandTestCase(TestBase):
     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):
@@ -97,7 +97,7 @@ class HelpCommandTestCase(TestBase):
             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: