Reduce code duplication between run_test_cases.py and trace_test_cases.py.

tools/isolate/trace_test_cases.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Traces each test cases of a google-test executable individually.
 
 Gives detailed information about each test case. The logs can be read afterward
 with ./trace_inputs.py read -l /path/to/executable.logs
 """
@@ skipping 156 matching lines @@
   return 0
 
 
 def main():
   """CLI frontend to validate arguments."""
   default_variables = [('OS', isolate.get_flavor())]
   if sys.platform in ('win32', 'cygwin'):
     default_variables.append(('EXECUTABLE_SUFFIX', '.exe'))
   else:
     default_variables.append(('EXECUTABLE_SUFFIX', ''))
-  parser = run_test_cases.OptionParserWithTestShardingAndFiltering(
+  parser = run_test_cases.OptionParserTestCases(
       usage='%prog <options> [gtest]',
       description=sys.modules['__main__'].__doc__)
   parser.format_description = lambda *_: parser.description
   parser.add_option(
       '-c', '--cwd',
       default='',
       help='Signal to start the process from this relative directory. When '
            'specified, outputs the inputs files in a way compatible for '
            'gyp processing. Should be set to the relative path containing the '
            'gyp file, e.g. \'chrome\' or \'net\'')
   parser.add_option(
       '-V', '--variable',
       nargs=2,
       action='append',
       default=default_variables,
       dest='variables',
       metavar='FOO BAR',
       help='Variables to process in the .isolate file, default: %default')
   parser.add_option(
       '--root-dir',
       default=ROOT_DIR,
       help='Root directory to base everything off. Default: %default')
   parser.add_option(
       '-o', '--out',
       help='output file, defaults to <executable>.test_cases')
-  parser.add_option(
-      '-j', '--jobs',
-      type='int',
-      help='number of parallel jobs')
-  parser.add_option(
-      '-t', '--timeout',
-      default=120,
-      type='int',
-      help='number of parallel jobs')
   options, args = parser.parse_args()
 
   if len(args) != 1:
     parser.error(
         'Please provide the executable line to run, if you need fancy things '
         'like xvfb, start this script from *inside* xvfb, it\'ll be much faster'
         '.')
 
   options.root_dir = os.path.abspath(options.root_dir)
   if not os.path.isdir(options.root_dir):
     parser.error('--root-dir "%s" must exist' % options.root_dir)
   if not os.path.isdir(os.path.join(options.root_dir, options.cwd)):
     parser.error(
         '--cwd "%s" must be an existing directory relative to %s' %
           (options.cwd, options.root_dir))
 
   executable = args[0]
   if not os.path.isabs(executable):
     executable = os.path.abspath(os.path.join(options.root_dir, executable))
   if not os.path.isfile(executable):
     parser.error('"%s" doesn\'t exist.' % executable)
 
   if not options.out:
     options.out = '%s.test_cases' % executable
 
-  # First, grab the test cases.
-  if options.test_case_file:
-    with open(options.test_case_file, 'r') as f:
-      test_cases = filter(None, f.read().splitlines())
-  else:
-    test_cases = run_test_cases.get_test_cases(
-        executable,
-        options.whitelist,
-        options.blacklist,
-        options.index,
-        options.shards)
+  test_cases = parser.process_gtest_options(executable, options)
 
   # Then run them.
   return trace_test_cases(
       executable,
       options.root_dir,
       options.cwd,
       dict(options.variables),
       test_cases,
       options.jobs,
       # TODO(maruel): options.timeout,
       options.out)
 
 
 if __name__ == '__main__':
   sys.exit(main())