Move android buildbot steps into buildbot dir

build/android/buildbot/bb_tests.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 json
 import optparse
 import os
@@ skipping 64 matching lines @@
   print '<', ' '.join(map(pipes.quote, command))
   if code != 0:
     print 'ERROR: non-zero status %d from %s' % (code, command)
     if flunk_on_failure:
       buildbot_report.PrintError()
     else:
       buildbot_report.PrintWarning()
   return code
 
 
-def RunTestSuites(options, suite):
+def RunTestSuites(options, suites):
   """Manages an invocation of run_tests.py.
 
   Args:
     options: options object.
-    suite: The suite to pass to run_tests or None to run default suites.
+    suites: List of suites to run, or None to run default suites.
   """
   args = ['--verbose']
-  if suite:
-    args.extend(['-s', suite])
+
+  suites = suites or constants.DEFAULT_UNIT_TEST_SUITES
   if options.target == 'Release':
     args.append('--release')
   if options.asan:
     args.append('--tool=asan')
-  RunCmd(['build/android/run_tests.py'] + args)
+  for suite in suites:
+    buildbot_report.PrintNamedStep(suite)
+    RunCmd(['build/android/run_tests.py', '-s', suite] + args)
 
 
 def InstallApk(apk, apk_package, target):
   args = ['--apk', apk, '--apk_package', apk_package]
   if target == 'Release':
     args.append('--release')
 
   RunCmd(['build/android/adb_install_apk.py'] + args)
 
 
@@ skipping 63 matching lines @@
   logcat_dir = os.path.join(CHROME_SRC, 'out/logcat')
   shutil.rmtree(logcat_dir, ignore_errors=True)
   SpawnCmd(['build/android/adb_logcat_monitor.py', logcat_dir])
 
   if 'unit' in options.test_filter:
     RunTestSuites(options, None)
   if 'ui' in options.test_filter:
     for test in INSTRUMENTATION_TESTS.itervalues():
       RunInstrumentationSuite(options, test)
   if 'webkit' in options.test_filter:
-    RunTestSuites(options, 'webkit_unit_tests')
-    RunTestSuites(options, 'TestWebKitAPI')
+    RunTestSuites(options, ['webkit_unit_tests'])
+    RunTestSuites(options, ['TestWebKitAPI'])
     RunWebkitLint(options.target)
   if 'webkit_layout' in options.test_filter:
     RunWebkitLayoutTests(options)
 
   if options.experimental:
-    RunTestSuites(options, 'sandbox_linux_unittests')
+    RunTestSuites(options, ['sandbox_linux_unittests'])
 
   # Print logcat, kill logcat monitor
-  buildbot_report.PrintNamedStep('Logcat dump')
+  buildbot_report.PrintNamedStep('logcat_dump')
   RunCmd(['build/android/adb_logcat_printer.py', logcat_dir])
 
-  buildbot_report.PrintNamedStep('Test report')
+  buildbot_report.PrintNamedStep('test_report')
   for report in glob.glob(
       os.path.join(CHROME_SRC, 'out', options.target, 'test_logs', '*.log')):
     subprocess.Popen(['cat', report]).wait()
     os.remove(report)
 
 
 def main(argv):
   parser = optparse.OptionParser()
 
   def convert_json(option, _, value, parser):
@@ skipping 32 matching lines @@
   if unknown_tests:
     return ParserError('Unknown tests %s' % list(unknown_tests))
 
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))