Move android buildbot steps into buildbot dir

build/android/run_tests.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 all the native unit tests.
 
 1. Copy over test binary to /data/local on device.
 2. Resources: chrome/unit_tests requires resources (chrome.pak and en-US.pak)
@@ skipping 41 matching lines @@
 from pylib import ports
 from pylib.base_test_sharder import BaseTestSharder
 from pylib.gtest import debug_info
 from pylib.gtest.single_test_runner import SingleTestRunner
 from pylib.utils import run_tests_helper
 from pylib.utils import test_options_parser
 from pylib.utils import time_profile
 from pylib.utils import xvfb
 
 
-_TEST_SUITES = ['base_unittests',
-                'cc_unittests',
-                'content_unittests',
-                'gpu_unittests',
-                'ipc_tests',
-                'media_unittests',
-                'net_unittests',
-                'sql_unittests',
-                'sync_unit_tests',
-                'ui_unittests',
-                'unit_tests',
-                'webkit_compositor_bindings_unittests',
-                'android_webview_unittests',
-               ]
-
-
 def FullyQualifiedTestSuites(exe, option_test_suite, build_type):
   """Get a list of absolute paths to test suite targets.
 
   Args:
     exe: if True, use the executable-based test runner.
     option_test_suite: the test_suite specified as an option.
     build_type: 'Release' or 'Debug'.
   """
   test_suite_dir = os.path.join(cmd_helper.OutDirectory.get(), build_type)
   if option_test_suite:
     all_test_suites = [option_test_suite]
   else:
-    all_test_suites = _TEST_SUITES
+    all_test_suites = constants.DEFAULT_UNIT_TEST_SUITES
 
   if exe:
     qualified_test_suites = [os.path.join(test_suite_dir, t)
                              for t in all_test_suites]
   else:
     # out/(Debug|Release)/$SUITE_apk/$SUITE-debug.apk
     qualified_test_suites = [os.path.join(test_suite_dir,
                                           t + '_apk',
                                           t + '-debug.apk')
                              for t in all_test_suites]
   for t, q in zip(all_test_suites, qualified_test_suites):
     if not os.path.exists(q):
       raise Exception('Test suite %s not found in %s.\n'
                       'Supported test suites:\n %s\n'
                       'Ensure it has been built.\n' %
-                      (t, q, _TEST_SUITES))
+                      (t, q, constants.DEFAULT_UNIT_TEST_SUITES))
   return qualified_test_suites
 
 
 class TestSharder(BaseTestSharder):
   """Responsible for sharding the tests on the connected devices."""
 
   def __init__(self, attached_devices, test_suite, gtest_filter,
                test_arguments, timeout, cleanup_test_files, tool,
                log_dump_name, build_type, in_webkit_checkout,
                flakiness_server=None):
@@ skipping 115 matching lines @@
   test bundles.  If using the emulator, we start it on entry and stop
   it on exit.
 
   Args:
     options: options for running the tests.
 
   Returns:
     0 if successful, number of failing tests otherwise.
   """
   step_name = os.path.basename(options.test_suite).replace('-debug.apk', '')
-  buildbot_report.PrintNamedStep(step_name)
   attached_devices = []
   buildbot_emulators = []
 
   if options.use_emulator:
     for n in range(options.emulator_count):
       t = time_profile.TimeProfile('Emulator launch %d' % n)
       avd_name = None
       if n > 0:
         # Creates a temporary AVD for the extra emulators.
         avd_name = 'run_tests_avd_%d' % n
       buildbot_emulator = emulator.Emulator(avd_name)
       buildbot_emulator.Launch(kill_all_emulators=n == 0)
       t.Stop()
       buildbot_emulators.append(buildbot_emulator)
       attached_devices.append(buildbot_emulator.device)
     # Wait for all emulators to boot completed.
     map(lambda buildbot_emulator: buildbot_emulator.ConfirmLaunch(True),
         buildbot_emulators)
   elif options.test_device:
     attached_devices = [options.test_device]
   else:
     attached_devices = android_commands.GetAttachedDevices()
 
   if not attached_devices:
     logging.critical('A device must be attached and online.')
     buildbot_report.PrintError()

[frankf, 2013/01/09 21:53:02]

This can be removed.

[Isaac (away), 2013/01/09 21:59:58]

Will do.

     return 1
 
   # Reset the test port allocation. It's important to do it before starting
   # to dispatch any tests.
   if not ports.ResetTestServerPortAllocation():
     raise Exception('Failed to reset test server port.')
 
   if options.gtest_filter:
     logging.warning('Sharding is not possible with these configurations.')
     attached_devices = [attached_devices[0]]
@@ skipping 48 matching lines @@
     failures += _RunATestSuite(test_options)
 
   if options.use_xvfb:
     framebuffer.Stop()
   return failures
 
 
 def ListTestSuites():
   """Display a list of available test suites."""
   print 'Available test suites are:'
-  for test_suite in _TEST_SUITES:
+  for test_suite in constants.DEFAULT_UNIT_TEST_SUITES:
     print test_suite
 
 
 def main(argv):
   option_parser = optparse.OptionParser()
   test_options_parser.AddGTestOptions(option_parser)
   options, args = option_parser.parse_args(argv)
 
   if len(args) > 1:
     option_parser.error('Unknown argument: %s' % args[1:])
 
   run_tests_helper.SetLogLevel(options.verbose_count)
 
   if options.out_directory:
     cmd_helper.OutDirectory.set(options.out_directory)
 
   if options.use_emulator:
     emulator.DeleteAllTempAVDs()
 
   failed_tests_count = Dispatch(options)
 
   # Failures of individual test suites are communicated by printing a
   # STEP_FAILURE message.
   # Returning a success exit status also prevents the buildbot from incorrectly
   # marking the last suite as failed if there were failures in other suites in
   # the batch (this happens because the exit status is a sum of all failures
   # from all suites, but the buildbot associates the exit status only with the
   # most recent step).
   if options.exit_code:
     return failed_tests_count

[frankf, 2013/01/09 21:53:02]

Why don't we always return failed_test_count? When dispatched on buildbots,
there's a single suite, so possible returns codes are 0 or 1. Right?

[Isaac (away), 2013/01/09 21:59:58]

I'm not sure, sorry.  It wouldn't surprise me if this code was doing something
silly.

   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))