Add telemetry tests to Android tester.

build/android/buildbot/bb_device_steps.py

Index: build/android/buildbot/bb_device_steps.py
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
index c6e5f268128b24a8b473683e95a5ab05dd204ac4..fda6ee2649852bd0a5a46397074c96b4edc892cb 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -77,8 +77,9 @@ INSTRUMENTATION_TESTS = dict((suite.name, suite) for suite in [
       'webview:android_webview/test/data/device_files'),
     ])
 
-VALID_TESTS = set(['chromedriver', 'gpu', 'ui', 'unit', 'webkit',
-                   'webkit_layout', 'webrtc_chromium', 'webrtc_native'])
+VALID_TESTS = set(['chromedriver', 'gpu', 'ui', 'unit', 'telemetry_tests',

[tonyg, 2014/04/12 01:37:29]

Looks like these were alphabetical. Should we maintain that?

[navabi, 2014/04/12 01:55:01]

Yes we should. Will fix. And I realized I should split them into
telemetry_unittests and telemetry_perf_unittests so that the bb_device_steps.py
can run them individually with the test filter.

+                   'webkit', 'webkit_layout', 'webrtc_chromium',
+                   'webrtc_native'])
 
 RunCmd = bb_utils.RunCmd
 
@@ -164,6 +165,19 @@ def RunChromeDriverTests(options):
           '--update-log'])
 
 
+def RunTelemetryTests(_):
+  """Runs the telemetry unit tests and perf unit tests.
+
+  Args:
+    options: options object.
+  """
+  args = ['--browser', 'android-chromium-testshell']
+  bb_annotations.PrintNamedStep('telemetry_unittests')
+  RunCmd(['tools/telemetry/run_tests'] + args)
+  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.
 
@@ -483,6 +497,7 @@ def GetTestStepCmds():
       ('gpu', RunGPUTests),
       ('unit', RunUnitTests),
       ('ui', RunInstrumentationTests),
+      ('telemetry_tests', RunTelemetryTests),

[tonyg, 2014/04/12 01:37:29]

ditto

       ('webkit', RunWebkitTests),
       ('webkit_layout', RunWebkitLayoutTests),
       ('webrtc_chromium', RunWebRTCChromiumTests),