[Android] Move GTest options to test_options_parser.py.

build/android/pylib/utils/test_options_parser.py

 # 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.
 
 """Parses options for the instrumentation tests."""
 
-import constants
+from pylib import constants

[klundberg, 2013/01/03 21:04:07]

Does it make sense to move constants too?

I don't like the idea of having utils depend on pylib and pylib depend on utils.

[craigdh, 2013/01/03 21:13:12]

I don't like it either, but constants.py is used in a lot of places, so I think
that should be its own CL if we decide to move it.

@Frank, any input? Do people outside build/android depend on constants.py?
utils/ seems like it should only have private utilities not used outside of
build/android/.

+
 import optparse
 import os
 import sys
 
 _SDK_OUT_DIR = os.path.join(constants.CHROME_DIR, 'out')
 
 
 def AddBuildTypeOption(option_parser):
   """Decorates OptionParser with build type option."""
   default_build_type = 'Debug'
@@ skipping 55 matching lines @@
                            dest='tool',
                            help='Run the test under a tool '
                            '(use --tool help to list them)')
   option_parser.add_option('--flakiness-dashboard-server',
                            dest='flakiness_dashboard_server',
                            help=('Address of the server that is hosting the '
                                  'Chrome for Android flakiness dashboard.'))
   AddBuildTypeOption(option_parser)
 
 
+def AddGTestOptions(option_parser):

[frankf, 2013/01/03 21:17:23]

So the reason the other options are here, is that they're used by more than one
test runner. This is only used by run_tests.py. But I see the value of moving it
here for consistancy, and also to be able to see what options can be factored
out into AddTestRunnerOptions.

[craigdh, 2013/01/03 21:44:05]

Improving consistency between the various test runners in general should make
refactoring out common code much easier.

+  """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)')

[klundberg, 2013/01/03 21:04:07]

nit: period at end of sentence.

[craigdh, 2013/01/03 21:44:05]

Done.

+  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 the test suite to run ')

[klundberg, 2013/01/03 21:04:07]

Seems like something is missing in this sentence. Maybe it should be:
Target device for the test suite to run on. 

[craigdh, 2013/01/03 21:44:05]

Done.

+  option_parser.add_option('-f', '--gtest_filter', dest='gtest_filter',
+                           help='gtest filter')

[klundberg, 2013/01/03 21:04:07]

nit: period at end of sentence.

[craigdh, 2013/01/03 21:44:05]

Done.

[craigdh, 2013/01/03 21:44:05]

Done.

+  option_parser.add_option('-a', '--test_arguments', dest='test_arguments',
+                           help='Additional arguments to pass to the test')

[klundberg, 2013/01/03 21:04:07]

nit: period at end of sentence.

[craigdh, 2013/01/03 21:44:05]

Done.

+  option_parser.add_option('-L', dest='log_dump',
+                           help='file name of log dump, which will be put in '

[klundberg, 2013/01/03 21:04:07]

file/File

[craigdh, 2013/01/03 21:44:05]

Done.

+                           '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')

[klundberg, 2013/01/03 21:04:07]

nit: period at end of sentence.

[craigdh, 2013/01/03 21:44:05]

Done.

+  option_parser.add_option('-n', '--emulator_count',

[frankf, 2013/01/03 21:17:23]

For reference: at some point (not in this CL), it'd be good to make all options
params to use '-' not '_'.

[craigdh, 2013/01/03 21:44:05]

Added a TODO.

+                           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)')

[klundberg, 2013/01/03 21:04:07]

nit: period at end of sentence.

[craigdh, 2013/01/03 21:44:05]

Done.

+  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')

[klundberg, 2013/01/03 21:04:07]

nit: period at end of sentence.

[craigdh, 2013/01/03 21:44:05]

Done.

+  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."""
 
   AddTestRunnerOptions(option_parser)
   option_parser.add_option('-w', '--wait_debugger', dest='wait_for_debugger',
                            action='store_true', help='Wait for debugger.')
   option_parser.add_option('-I', dest='install_apk', help='Install APK.',
                            action='store_true')
   option_parser.add_option('-f', '--test_filter',
                            help='Test filter (if not fully qualified, '
@@ skipping 83 matching lines @@
                                          '%s.apk' % options.test_apk)
     options.test_apk_jar_path = os.path.join(
         _SDK_OUT_DIR, options.build_type, constants.SDK_BUILD_TEST_JAVALIB_DIR,
         '%s.jar' %  options.test_apk)
   if options.annotation_str:
     options.annotation = options.annotation_str.split()
   elif options.test_filter:
     options.annotation = []
   else:
     options.annotation = ['Smoke', 'SmallTest', 'MediumTest', 'LargeTest']