[Android] Dedup content_browsertests test setup from gtests.

build/android/buildbot/bb_device_steps.py

 #!/usr/bin/env python
 # Copyright (c) 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.
 
 import collections
 import glob
 import multiprocessing
 import os
 import shutil
@@ skipping 87 matching lines @@
       bb_annotations.PrintWarning()
     else:
       print 'Reboots complete.'
 
 
 def RunTestSuites(options, suites):
   """Manages an invocation of test_runner.py for gtests.
 
   Args:
     options: options object.
-    suites: List of suites to run.
+    suites: List of suite names to run.
   """
   args = ['--verbose']
   if options.target == 'Release':
     args.append('--release')
   if options.asan:
     args.append('--tool=asan')
   for suite in suites:
-    bb_annotations.PrintNamedStep(suite.name)
-    cmd = ['build/android/test_runner.py', 'gtest', '-s', suite.name] + args
-    if suite.is_suite_exe:
-      cmd.append('--exe')
+    bb_annotations.PrintNamedStep(suite)
+    cmd = ['build/android/test_runner.py', 'gtest', '-s', suite] + args
+    if suite == 'content_browsertests':
+      cmd.append('--num_retries=1')
     RunCmd(cmd)
 
-def RunBrowserTestSuite(options):
-  """Manages an invocation of test_runner.py for content_browsertests.
-
-  Args:
-    options: options object.
-  """
-  args = ['--verbose', '--num_retries=1']
-  if options.target == 'Release':
-    args.append('--release')
-  if options.asan:
-    args.append('--tool=asan')
-  bb_annotations.PrintNamedStep(constants.BROWSERTEST_SUITE_NAME)
-  RunCmd(['build/android/test_runner.py', 'content_browsertests'] + args)
-
 def RunChromeDriverTests(_):
   """Run all the steps for running chromedriver tests."""
   bb_annotations.PrintNamedStep('chromedriver_annotation')
   RunCmd(['chrome/test/chromedriver/run_buildbot_steps.py',
           '--android-package=%s' % constants.CHROMIUM_TEST_SHELL_PACKAGE])
 
 def InstallApk(options, test, print_step=False):
   """Install an apk to all phones.
 
   Args:
@@ skipping 134 matching lines @@
 def RunUnitTests(options):
   RunTestSuites(options, gtest_config.STABLE_TEST_SUITES)
 
 
 def RunInstrumentationTests(options):
   for test in INSTRUMENTATION_TESTS.itervalues():
     RunInstrumentationSuite(options, test)
 
 
 def RunWebkitTests(options):
-  RunTestSuites(options, [gtest_config.Apk('webkit_unit_tests')])
+  RunTestSuites(options, ['webkit_unit_tests'])
   RunWebkitLint(options.target)
 
 
 def GetTestStepCmds():
   return [
       ('chromedriver', RunChromeDriverTests),
       ('unit', RunUnitTests),
       ('ui', RunInstrumentationTests),
       ('webkit', RunWebkitTests),
       ('webkit_layout', RunWebkitLayoutTests)
@@ skipping 36 matching lines @@
 
   if options.install:
     test_obj = INSTRUMENTATION_TESTS[options.install]
     InstallApk(options, test_obj, print_step=True)
 
   if options.test_filter:
     bb_utils.RunSteps(options.test_filter, GetTestStepCmds(), options)
 
   if options.experimental:
     RunTestSuites(options, gtest_config.EXPERIMENTAL_TEST_SUITES)
-    RunBrowserTestSuite(options)
 
   # Run all post test steps
   for _, cmd in GetPostTestStepCmds():
     cmd(options)
 
 
 def GetDeviceStepsOptParser():
   parser = bb_utils.GetParser()
   parser.add_option('--experimental', action='store_true',
                     help='Run experiemental tests')
@@ skipping 32 matching lines @@
     return sys.exit('Unknown tests %s' % list(unknown_tests))
 
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
 
   MainTestWrapper(options)
   provision_devices.KillHostHeartbeat()
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))