[Android] Sets up a coverage system for java using EMMA

build/android/buildbot/bb_run_bot.py

Index: build/android/buildbot/bb_run_bot.py
diff --git a/build/android/buildbot/bb_run_bot.py b/build/android/buildbot/bb_run_bot.py
index 7637024693e8256515de422cd1f32c0c042d9e07..ddac81c8d18066d635202eedf37f0dd84bfbdb89 100755
--- a/build/android/buildbot/bb_run_bot.py
+++ b/build/android/buildbot/bb_run_bot.py
@@ -19,6 +19,8 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 from pylib import constants
 
 
+CHROMIUM_COVERAGE_BUCKET = 'chromium-code-coverage'
+
 _BotConfig = collections.namedtuple(
     'BotConfig', ['bot_id', 'host_obj', 'test_obj'])
 
@@ -43,10 +45,11 @@ def DictDiff(d1, d2):
   return '\n'.join(diff)
 
 
-def GetEnvironment(host_obj, testing):
+def GetEnvironment(host_obj, testing, bot_id):
   init_env = dict(os.environ)
   init_env['GYP_GENERATORS'] = 'ninja'
   init_env['GOMA_DIR'] = bb_utils.GOMA_DIR
+  init_env['BUILDBOT_ID'] = bot_id

[bulach, 2013/08/20 17:42:34]

what is this? is it the same as BUILDBOT_BUILDERNAME?

   envsetup_cmd = '. build/android/envsetup.sh'
   if host_obj.target_arch:
     envsetup_cmd += ' --target-arch=%s' % host_obj.target_arch
@@ -114,7 +117,7 @@ def GetBotStepMap():
   std_host_tests = ['check_webview_licenses', 'findbugs']
   std_build_steps = ['compile', 'zip_build']
   std_test_steps = ['extract_build']
-  std_tests = ['ui', 'unit']
+  std_tests = ['ui']

[bulach, 2013/08/20 17:42:34]

what about unit?

   flakiness_server = (
       '--flakiness-server=%s' % constants.UPSTREAM_FLAKINESS_SERVER)
   experimental = ['--experimental']
@@ -144,12 +147,14 @@ def GetBotStepMap():
       B('fyi-x86-builder-dbg',
         H(compile_step + std_host_tests, experimental, target_arch='x86')),
       B('fyi-builder-dbg',
-        H(std_build_steps + std_host_tests, experimental)),
+        H(std_build_steps + std_host_tests, experimental,
+          extra_gyp='emma_coverage=1')),
       B('x86-builder-dbg',
         H(compile_step + std_host_tests, target_arch='x86')),
       B('fyi-builder-rel', H(std_build_steps,  experimental)),
       B('fyi-tests', H(std_test_steps),
-        T(std_tests, ['--experimental', flakiness_server])),
+        T(std_tests, ['--experimental', flakiness_server,
+                      '--coverage-bucket', CHROMIUM_COVERAGE_BUCKET])),
       B('fyi-component-builder-tests-dbg',
         H(compile_step, extra_gyp='component=shared_library'),
         T(std_tests, ['--experimental', flakiness_server])),
@@ -265,7 +270,8 @@ def main(argv):
     print 'Will run: ', bb_utils.CommandToString(command)
   print
 
-  env = GetEnvironment(bot_config.host_obj, options.testing)
+  bot_id = options.bot_id or options.factory_properties.get('android_bot_id')
+  env = GetEnvironment(bot_config.host_obj, options.testing, bot_id)
   return RunBotCommands(options, commands, env)