Add telemetry tests to Android tester.

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 hashlib
 import json
 import multiprocessing
@@ skipping 59 matching lines @@
       'ChromeShellTest',
       'chrome:chrome/test/data/android/device_files',
       constants.CHROME_SHELL_HOST_DRIVEN_DIR),
     I('AndroidWebView',
       'AndroidWebView.apk',
       'org.chromium.android_webview.shell',
       'AndroidWebViewTest',
       'webview:android_webview/test/data/device_files'),
     ])
 
-VALID_TESTS = set(['chromedriver', 'gpu', 'ui', 'unit', 'webkit',
+VALID_TESTS = set(['chromedriver', 'gpu', 'telemetry_perf_unittests',
+                   'telemetry_unittests', 'ui', 'unit', 'webkit',
                    'webkit_layout', 'webrtc_chromium', 'webrtc_native'])
 
 RunCmd = bb_utils.RunCmd
 
 
 def _GetRevision(options):
   """Get the SVN revision number.
 
   Args:
     options: options object.
@@ skipping 66 matching lines @@
   RunCmd(['chrome/test/chromedriver/run_buildbot_steps.py',
           '--android-packages=%s,%s,%s,%s' %
           ('chrome_shell',
            'chrome_stable',
            'chrome_beta',
            'chromedriver_webview_shell'),
           '--revision=%s' % _GetRevision(options),
           '--update-log'])
 
 
+def RunTelemetryUnitTests(_):
+  """Runs the telemetry unit tests.
+
+  Args:
+    options: options object.
+  """
+  args = ['--browser', 'android-chromium-testshell']
+  bb_annotations.PrintNamedStep('telemetry_unittests')
+  RunCmd(['tools/telemetry/run_tests'] + args)
+
+
+def RunTelemetryPerfUnitTests(_):
+  """Runs the telemetry perf unit tests.
+
+  Args:
+    options: options object.
+  """
+  args = ['--browser', 'android-chromium-testshell']
+  bb_annotations.PrintNamedStep('telemetry_perf_unittests')
+  RunCmd(['tools/perf/run_tests'] + args)
+
+
 def InstallApk(options, test, print_step=False):
   """Install an apk to all phones.
 
   Args:
     options: options object
     test: An I_TEST namedtuple
     print_step: Print a buildbot step
   """
   if print_step:
     bb_annotations.PrintNamedStep('install_%s' % test.name.lower())
@@ skipping 297 matching lines @@
   bb_annotations.PrintNamedStep('webgl_conformance_tests')
   RunCmd(['content/test/gpu/run_gpu_test.py',
           '--browser=android-content-shell', 'webgl_conformance',
           '--webgl-conformance-version=1.0.1'])
 
 
 def GetTestStepCmds():
   return [
       ('chromedriver', RunChromeDriverTests),
       ('gpu', RunGPUTests),
+      ('telemetry_perf_unittests', RunTelemetryPerfUnitTests),
+      ('telemetry_unittests', RunTelemetryUnitTests),
       ('unit', RunUnitTests),
       ('ui', RunInstrumentationTests),
       ('webkit', RunWebkitTests),
       ('webkit_layout', RunWebkitLayoutTests),
       ('webrtc_chromium', RunWebRTCChromiumTests),
       ('webrtc_native', RunWebRTCNativeTests),
   ]
 
 
 def UploadHTML(options, gs_base_dir, dir_to_upload, link_text,
@@ skipping 152 matching lines @@
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
   if options.coverage_bucket:
     setattr(options, 'coverage_dir',
             os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))