dotest.py - fixed a bug displaying usage

[zturner]

Looks fine, in the future it seems like a good cleanup would be to move all
the argument validation into dotest_args, but this seems fine for now.

[clayborg]

I believe this is already fixed?

[zturner]

Vince submitted a fix for this in r238043.

test/dosep.py

parser.add_option('-t', '--threads',
                       dest='num_threads',
                       help="""The number of threads to use when running tests separately.""")
 
     opts, args = parser.parse_args()
     dotest_option_string = opts.dotest_options
 
     is_posix = (os.name == "posix")
     dotest_argv = shlex.split(dotest_option_string, posix=is_posix) if dotest_option_string else []
-    dotest_options = dotest_args.getArguments(dotest_argv)
+
+    parser = dotest_args.create_parser()
+    dotest_options = dotest_args.parse_args(parser, dotest_argv)
+
     if not dotest_options.s:
         # no session log directory, we need to add this to prevent
         # every dotest invocation from creating its own directory
         import datetime
         # The windows platforms don't like ':' in the pathname.
         timestamp_started = datetime.datetime.now().strftime("%Y-%m-%d-%H_%M_%S")
         dotest_argv.append('-s')
         dotest_argv.append(timestamp_started)

test/dotest.py

def parseOptionsAndInitTestdirs():
     global lldb_platform_working_dir
     global setCrashInfoHook
 
     do_help = False
 
     platform_system = platform.system()
     platform_machine = platform.machine()
 
-    args = dotest_args.getArguments(sys.argv[1:])
+    parser = dotest_args.create_parser()
+    args = dotest_args.parse_args(parser, sys.argv[1:])
     
     if args.unset_env_varnames:
         for env_var in args.unset_env_varnames:
             if env_var in os.environ:
                 # From Python Doc: When unsetenv() is supported, deletion of items in os.environ
                 # is automatically translated into a corresponding call to unsetenv().
                 del os.environ[env_var]
                 #os.unsetenv(env_var)

test/dotest_args.py

if sys.version_info >= (2, 7):
         if ('LLDB_TEST_ARGUMENTS' in os.environ):
             print "Arguments passed through environment: '%s'" % os.environ['LLDB_TEST_ARGUMENTS']
             args = parser.parse_args([sys.argv[0]].__add__(os.environ['LLDB_TEST_ARGUMENTS'].split()),namespace=args)
 
         return parser.parse_args(args=argv, namespace=args)
     else:
         return parser.parse_args(args=argv)
 
-def getArguments(argv):
-
+def create_parser():
     parser = argparse.ArgumentParser(description='description', prefix_chars='+-', add_help=False)
     group = None
 
     # Helper function for boolean options (group will point to the current group when executing X)
     X = lambda optstr, helpstr, **kwargs: group.add_argument(optstr, help=helpstr, action='store_true', **kwargs)
 
     group = parser.add_argument_group('Help')
     group.add_argument('-h', '--help', dest='h', action='store_true', help="Print this help message and exit.  Add '-v' for more detailed help.")
def create_parser():
     group.set_defaults(hide_inferior_console=True)
 
     # Remove the reference to our helper function
     del X
 
     group = parser.add_argument_group('Test directories')
     group.add_argument('args', metavar='test-dir', nargs='*', help='Specify a list of directory names to search for test modules named after Test*.py (test discovery). If empty, search from the current working directory instead.')
 
-    return parse_args(parser, argv)
+    return parser