Add telemetry tests to Android tester.

build/android/buildbot/bb_run_bot.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 copy
 import json
 import os
@@ skipping 101 matching lines @@
     commands.append(run_test_cmd)
   return commands
 
 
 def GetBotStepMap():
   compile_step = ['compile']
   std_host_tests = ['check_webview_licenses', 'findbugs']
   std_build_steps = ['compile', 'zip_build']
   std_test_steps = ['extract_build']
   std_tests = ['ui', 'unit']
+  telemetry_tests = ['telemetry_unittests', 'telemetry_perf_unittests']
   flakiness_server = (
       '--flakiness-server=%s' % constants.UPSTREAM_FLAKINESS_SERVER)
   experimental = ['--experimental']
 
   B = BotConfig
   H = (lambda steps, extra_args=None, extra_gyp=None, target_arch=None :
        HostConfig('build/android/buildbot/bb_host_steps.py', steps, extra_args,
                   extra_gyp, target_arch))
   T = (lambda tests, extra_args=None :
        TestConfig('build/android/buildbot/bb_device_steps.py', tests,
                   extra_args))
 
   bot_configs = [
       # Main builders
       B('main-builder-dbg', H(std_build_steps + std_host_tests)),
       B('main-builder-rel', H(std_build_steps)),
       B('main-clang-builder',
         H(compile_step, extra_gyp='clang=1 component=shared_library')),
       B('main-clobber', H(compile_step)),
-      B('main-tests', H(std_test_steps), T(std_tests, [flakiness_server])),
+      B('main-tests', H(std_test_steps), T(std_tests + telemetry_tests,
+                                           [flakiness_server])),
 
       # Other waterfalls
       B('asan-builder-tests', H(compile_step,
                                 extra_gyp='asan=1 component=shared_library'),
         T(std_tests, ['--asan', '--asan-symbolize'])),
       B('blink-try-builder', H(compile_step)),
       B('chromedriver-fyi-tests-dbg', H(std_test_steps),
         T(['chromedriver'], ['--install=ChromeShell'])),
       B('fyi-x86-builder-dbg',
         H(compile_step + std_host_tests, experimental, target_arch='x86')),
@@ skipping 39 matching lines @@
   bot_map = dict((config.bot_id, config) for config in bot_configs)
 
   # These bots have identical configuration to ones defined earlier.
   copy_map = [
       ('lkgr-clobber', 'main-clobber'),
       ('try-builder-dbg', 'main-builder-dbg'),
       ('try-builder-rel', 'main-builder-rel'),
       ('try-clang-builder', 'main-clang-builder'),
       ('try-fyi-builder-dbg', 'fyi-builder-dbg'),
       ('try-x86-builder-dbg', 'x86-builder-dbg'),
       ('try-tests', 'main-tests'),

[navabi, 2014/04/12 16:43:38]

I lied. This will also run on the try bots triggered by the CQ because of line
203. It says copy whatever we do for the main tester for testers.

       ('try-fyi-tests', 'fyi-tests'),
       ('webkit-latest-tests', 'main-tests'),
   ]
   for to_id, from_id in copy_map:
     assert to_id not in bot_map
     # pylint: disable=W0212
     bot_map[to_id] = copy.deepcopy(bot_map[from_id])._replace(bot_id=to_id)
 
     # Trybots do not upload to flakiness dashboard. They should be otherwise
     # identical in configuration to their trunk building counterparts.
@@ skipping 72 matching lines @@
   for command in commands:
     print 'Will run: ', bb_utils.CommandToString(command)
   print
 
   env = GetEnvironment(bot_config.host_obj, options.testing)
   return RunBotCommands(options, commands, env)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))