After discussions with Jim and Greg, modify the 'watchpoint set' command to become a mutiword command

with subcommand 'expression' and 'variable'.  The first subcommand is for supplying an expression to
be evaluated into an address to watch for, while the second is for watching a variable.

'watchpoint set expression' is a raw command, which means that you need to use the "--" option terminator
to end the '-w' or '-x' option processing and to start typing your expression.

Also update several test cases to comply and add a couple of test cases into TestCompletion.py,
in particular, test that 'watchpoint set ex' completes to 'watchpoint set expression ' and that
'watchpoint set var' completes to 'watchpoint set variable '.

llvm-svn: 150109

1 files changed, 5 insertions, 4 deletions

diff --git a/lldb/test/help/TestHelp.py b/lldb/test/help/TestHelp.py
index 4fe0c77e246..57e67362fae 100644
--- a/lldb/test/help/TestHelp.py
+++ b/lldb/test/help/TestHelp.py
@@ -122,11 +122,12 @@ class HelpCommandTestCase(TestBase):
             substrs = ['<watchpt-id-list>'])
 
     def test_help_watchpoint_set(self):
-        """Test that 'help watchpoint set' prints out <expr> for the '-e' option
-        and <variable-name> for the '-v' option."""
+        """Test that 'help watchpoint set' prints out 'expression' and 'variable'
+        as the possible subcommands."""
         self.expect("help watchpoint set",
-            patterns = ['watchpoint set -e.*<expr>',
-                        'watchpoint set -v.*<variable-name>'])
+            substrs = ['The following subcommands are supported:'],
+            patterns = ['expression +--',
+                        'variable +--'])
 
 
 if __name__ == '__main__':