Support GTest's spellings for its options.

build/android/test_runner.py

 #!/usr/bin/env python
 #
 # Copyright 2013 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 all types of tests from one unified interface."""
 
 import collections
 import logging
@@ skipping 82 matching lines @@
   """Adds gtest options to |option_parser|."""
 
   option_parser.usage = '%prog gtest [options]'
   option_parser.commands_dict = {}
   option_parser.example = '%prog gtest -s base_unittests'
 
   # TODO(gkanwar): Make this option required
   option_parser.add_option('-s', '--suite', dest='suite_name',
                            help=('Executable name of the test suite to run '
                                  '(use -s help to list them).'))
-  option_parser.add_option('-f', '--gtest-filter', dest='test_filter',
+  option_parser.add_option('-f', '--gtest_filter', '--gtest-filter',
+                           dest='test_filter',
                            help='googletest-style filter string.')
-  option_parser.add_option('--gtest-also-run-disabled-tests',
+  option_parser.add_option('--gtest_also_run_disabled_tests',
+                           '--gtest-also-run-disabled-tests',
                            dest='run_disabled', action='store_true',
                            help='Also run disabled tests if applicable.')
   option_parser.add_option('-a', '--test-arguments', dest='test_arguments',
                            default='',
                            help='Additional arguments to pass to the test.')
   option_parser.add_option('-t', dest='timeout',
                            help='Timeout to wait for each test',
                            type='int',
                            default=60)
   # TODO(gkanwar): Move these to Common Options once we have the plumbing
@@ skipping 678 matching lines @@
 
 
 def main(argv):
   option_parser = command_option_parser.CommandOptionParser(
       commands_dict=VALID_COMMANDS)
   return command_option_parser.ParseAndExecute(option_parser)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))