[Android] Move GTest options to test_options_parser.py.

build/android/pylib/utils/test_options_parser.py

Index: build/android/pylib/utils/test_options_parser.py
diff --git a/build/android/pylib/test_options_parser.py b/build/android/pylib/utils/test_options_parser.py
similarity index 74%
rename from build/android/pylib/test_options_parser.py
rename to build/android/pylib/utils/test_options_parser.py
index 93382645c366a44d1de9cd82f0fef693f5933e60..7633c873a62167aa59e4228b3b11970d90d7f9f6 100644
--- a/build/android/pylib/test_options_parser.py
+++ b/build/android/pylib/utils/test_options_parser.py
@@ -4,7 +4,9 @@
 
 """Parses options for the instrumentation tests."""
 
-import constants
+#TODO(craigdh): pylib/utils/ should not depend on pylib/.
+from pylib import constants
+
 import optparse
 import os
 import sys
@@ -80,6 +82,58 @@ def AddTestRunnerOptions(option_parser, default_timeout=60):
   AddBuildTypeOption(option_parser)
 
 
+def AddGTestOptions(option_parser):
+  """Decorates OptionParser with GTest tests options."""
+
+  AddTestRunnerOptions(option_parser, default_timeout=0)
+  option_parser.add_option('-s', '--suite', dest='test_suite',
+                           help='Executable name of the test suite to run '
+                           '(use -s help to list them).')
+  option_parser.add_option('--out-directory', dest='out_directory',
+                           help='Path to the out/ directory, irrespective of '
+                           'the build type. Only for non-Chromium uses.')
+  option_parser.add_option('-d', '--device', dest='test_device',
+                           help='Target device for the test suite to run on.')
+  option_parser.add_option('-f', '--gtest_filter', dest='gtest_filter',
+                           help='gtest filter.')
+  #TODO(craigdh): Replace _ with - in arguments for consistency.
+  option_parser.add_option('-a', '--test_arguments', dest='test_arguments',
+                           help='Additional arguments to pass to the test.')
+  option_parser.add_option('-L', dest='log_dump',
+                           help='File name of log dump, which will be put in '
+                           'subfolder debug_info_dumps under the same '
+                           'directory in where the test_suite exists.')
+  option_parser.add_option('-e', '--emulator', dest='use_emulator',
+                           action='store_true',
+                           help='Run tests in a new instance of emulator.')
+  option_parser.add_option('-n', '--emulator_count',
+                           type='int', default=1,
+                           help='Number of emulators to launch for running the '
+                           'tests.')
+  option_parser.add_option('-x', '--xvfb', dest='use_xvfb',
+                           action='store_true',
+                           help='Use Xvfb around tests (ignored if not Linux).')
+  option_parser.add_option('--webkit', action='store_true',
+                           help='Run the tests from a WebKit checkout.')
+  option_parser.add_option('--fast', '--fast_and_loose', dest='fast_and_loose',
+                           action='store_true',
+                           help='Go faster (but be less stable), '
+                           'for quick testing.  Example: when tracking down '
+                           'tests that hang to add to the disabled list, '
+                           'there is no need to redeploy the test binary '
+                           'or data to the device again.  '
+                           'Don\'t use on bots by default!')
+  option_parser.add_option('--repeat', dest='repeat', type='int',
+                           default=2,
+                           help='Repeat count on test timeout.')
+  option_parser.add_option('--exit_code', action='store_true',
+                           help='If set, the exit code will be total number '
+                           'of failures.')
+  option_parser.add_option('--exe', action='store_true',
+                           help='If set, use the exe test runner instead of '
+                           'the APK.')
+
+
 def AddInstrumentationOptions(option_parser):
   """Decorates OptionParser with instrumentation tests options."""