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

tools/isolate/run_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.
 
 """Runs each test cases as a single shard, single process execution.
 
 Similar to sharding_supervisor.py but finer grained. Runs multiple instances in
 parallel.
 """
@@ skipping 794 matching lines @@
         options.whitelist, options.blacklist = options.gtest_filter.split('-',
                                                                           1)
       else:
         options.whitelist = options.gtest_filter
         options.blacklist = ''
       options.whitelist = [i for i in options.whitelist.split(':') if i]
       options.blacklist = [i for i in options.blacklist.split(':') if i]
 
     return options, args
 
+  @staticmethod
+  def process_gtest_options(executable, options):
+    """Grabs the test cases."""
+    if options.test_case_file:
+      with open(options.test_case_file, 'r') as f:
+        return sorted(filter(None, f.read().splitlines()))
+    else:
+      return get_test_cases(
+          executable,
+          options.whitelist,
+          options.blacklist,
+          options.index,
+          options.shards)
+
+
+class OptionParserTestCases(OptionParserWithTestShardingAndFiltering):
+  def __init__(self, *args, **kwargs):
+    OptionParserWithTestShardingAndFiltering.__init__(self, *args, **kwargs)
+    self.add_option(
+        '-j', '--jobs',
+        type='int',
+        default=num_processors(),
+        help='number of parallel jobs; default=%default')
+    self.add_option(
+        '-t', '--timeout',
+        type='int',
+        default=120,
+        help='Timeout for a single test case, in seconds default:%default')
+
 
 def main(argv):
   """CLI frontend to validate arguments."""
-  parser = OptionParserWithTestShardingAndFiltering(
+  parser = OptionParserTestCases(
       usage='%prog <options> [gtest]',
       verbose=int(os.environ.get('ISOLATE_DEBUG', 0)))
   parser.add_option(
-      '-j', '--jobs',
-      type='int',
-      default=num_processors(),
-      help='number of parallel jobs; default=%default')
-  parser.add_option(
-      '-t', '--timeout',
-      type='int',
-      default=120,
-      help='Timeout for a single test case, in seconds default:%default')
-  parser.add_option(
       '--run-all',
       action='store_true',
       default=bool(int(os.environ.get('RUN_TEST_CASES_RUN_ALL', '0'))),
       help='Do not fail early when a large number of test cases fail')
   parser.add_option(
       '--no-dump',
       action='store_true',
       help='do not generate a .run_test_cases file')
   parser.add_option(
       '--result',
       default=os.environ.get('RUN_TEST_CASES_RESULT_FILE', ''),
       help='Override the default name of the generated .run_test_cases file')
   options, args = parser.parse_args(argv)
 
   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'
         '.')
 
   executable = args[0]
   if not os.path.isabs(executable):
     executable = os.path.abspath(executable)
   if sys.platform in ('cygwin', 'win32'):
     if not os.path.splitext(executable)[1]:
       executable += '.exe'
   if not os.path.isfile(executable):
     parser.error('"%s" doesn\'t exist.' % executable)
 
-  # 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 = get_test_cases(
-        executable,
-        options.whitelist,
-        options.blacklist,
-        options.index,
-        options.shards)
-
+  test_cases = parser.process_gtest_options(executable, options)
   if not test_cases:
     # If test_cases is None then there was a problem generating the tests to
     # run, so this should be considered a failure.
     return int(test_cases is None)
 
   if options.no_dump:
     result_file = None
   else:
     if options.result:
       result_file = options.result
     else:
       result_file = '%s.run_test_cases' % executable
 
   return run_test_cases(
       executable,
       test_cases,
       options.jobs,
       options.timeout,
       options.run_all,
       result_file)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))