[Android] Buildbot changes for EMMA code coverage

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 multiprocessing
 import os
+import random
 import shutil
 import sys
 
 import bb_utils
 import bb_annotations
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 import provision_devices
 from pylib import android_commands
 from pylib import constants
 from pylib.gtest import gtest_config
 
 sys.path.append(os.path.join(
     constants.DIR_SOURCE_ROOT, 'third_party', 'android_testrunner'))
 import errors
 
 
 CHROME_SRC = constants.DIR_SOURCE_ROOT
 LOGCAT_DIR = os.path.join(CHROME_SRC, 'out', 'logcat')
+REVISION_FILENAME = 'FULL_BUILD_REVISION'
 
 # Describes an instrumation test suite:
 #   test: Name of test we're running.
 #   apk: apk to be installed.
 #   apk_package: package for the apk to be installed.
 #   test_apk: apk to run tests on.
 #   test_data: data folder in format destination:source.
 #   host_driven_root: The host-driven test root directory.
 #   annotation: Annotation of the tests to include.
 #   exclude_annotation: The annotation of the tests to exclude.
@@ skipping 119 matching lines @@
   InstallApk(options, test)
   args = ['--test-apk', test.test_apk, '--test_data', test.test_data,
           '--verbose']
   if options.target == 'Release':
     args.append('--release')
   if options.asan:
     args.append('--tool=asan')
   if options.flakiness_server:
     args.append('--flakiness-dashboard-server=%s' %
                 options.flakiness_server)
+  if options.coverage_bucket:
+    args.append('--coverage-dir=%s' % options.coverage_dir)
   if test.host_driven_root:
     args.append('--host-driven-root=%s' % test.host_driven_root)
   if test.annotation:
     args.extend(['-A', test.annotation])
   if test.exclude_annotation:
     args.extend(['-E', test.exclude_annotation])
   if test.extra_flags:
     args.extend(test.extra_flags)
   if python_only:
     args.append('-p')
@@ skipping 109 matching lines @@
   return [
       ('chromedriver', RunChromeDriverTests),
       ('unit', RunUnitTests),
       ('ui', RunInstrumentationTests),
       ('webkit', RunWebkitTests),
       ('webkit_layout', RunWebkitLayoutTests),
       ('webrtc', RunWebRTCTests),
   ]
 
 
+def UploadCoverageData(options, path, coverage_type):

[frankf, 2013/08/21 01:13:45]

Add docstring

[gkanwar1, 2013/08/21 01:29:13]

Done.

+  revision = options.build_properties.get('got_revision', 'testing')
+  bot_id = options.build_properties.get('buildername', 'testing')
+
+  randhash = hashlib.sha1(str(random.random())).hexdigest()
+
+  RunCmd([bb_utils.GSUTIL_PATH, 'cp', '-R', path, 'gs://%s/%s/%s/%s/%s' %
+          (options.coverage_bucket, coverage_type, bot_id, revision, randhash)])

[frankf, 2013/08/21 01:13:45]

DRY, create a var for gs path

[gkanwar1, 2013/08/21 01:29:13]

Done.

+  bb_annotations.PrintLink(
+      'Coverage report',
+      'https://storage.googleapis.com/%s/%s/%s/%s/%s/index.html'
+      % (options.coverage_bucket, coverage_type, bot_id, revision, randhash))
+
+
+def GenerateJavaCoverageReport(options):
+  bb_annotations.PrintNamedStep('java_coverage_report')
+
+  coverage_html = os.path.join(options.coverage_dir, 'coverage_html')
+  RunCmd(['build/android/generate_emma_html.py',
+          '--coverage-dir', options.coverage_dir,
+          '--metadata-dir', os.path.join(CHROME_SRC, 'out', options.target),
+          '--output', os.path.join(coverage_html, 'index.html')])
+  UploadCoverageData(options, coverage_html, 'java')
+
+
 def LogcatDump(options):
   # Print logcat, kill logcat monitor
   bb_annotations.PrintNamedStep('logcat_dump')
   logcat_file = os.path.join(CHROME_SRC, 'out', options.target, 'full_log')
   with open(logcat_file, 'w') as f:
     RunCmd([
         os.path.join(CHROME_SRC, 'build', 'android', 'adb_logcat_printer.py'),
         LOGCAT_DIR], stdout=f)
   RunCmd(['cat', logcat_file])
 
@@ skipping 15 matching lines @@
     for _, cmd in GetDeviceSetupStepCmds():
       cmd(options)
 
     if options.install:
       test_obj = INSTRUMENTATION_TESTS[options.install]
       InstallApk(options, test_obj, print_step=True)
 
     if options.test_filter:
       bb_utils.RunSteps(options.test_filter, GetTestStepCmds(), options)
 
+    if options.coverage_bucket:
+      GenerateJavaCoverageReport(options)
+
     if options.experimental:
       RunTestSuites(options, gtest_config.EXPERIMENTAL_TEST_SUITES)
 
   finally:
     # Run all post test steps
     LogcatDump(options)
     GenerateTestReport(options)
     # KillHostHeartbeat() has logic to check if heartbeat process is running,
     # and kills only if it finds the process is running on the host.
     provision_devices.KillHostHeartbeat()
 
 
 def GetDeviceStepsOptParser():
   parser = bb_utils.GetParser()
   parser.add_option('--experimental', action='store_true',
                     help='Run experiemental tests')
   parser.add_option('-f', '--test-filter', metavar='<filter>', default=[],
                     action='append',
                     help=('Run a test suite. Test suites: "%s"' %
                           '", "'.join(VALID_TESTS)))
   parser.add_option('--asan', action='store_true', help='Run tests with asan.')
   parser.add_option('--install', metavar='<apk name>',
                     help='Install an apk by name')
   parser.add_option('--reboot', action='store_true',
                     help='Reboot devices before running tests')
+  parser.add_option('--coverage-bucket',
+                    help=('Bucket name to store coverage results. Coverage is '
+                          'only run if this is set.'))
   parser.add_option(
       '--flakiness-server',
       help='The flakiness dashboard server to which the results should be '
            'uploaded.')
   parser.add_option(
       '--auto-reconnect', action='store_true',
       help='Push script to device which restarts adbd on disconnections.')
   parser.add_option(
       '--logcat-dump-output',
       help='The logcat dump output will be "tee"-ed into this file')
 
   return parser
 
 
 def main(argv):
   parser = GetDeviceStepsOptParser()
   options, args = parser.parse_args(argv[1:])
 
   if args:
     return sys.exit('Unused args %s' % args)
 
   unknown_tests = set(options.test_filter) - VALID_TESTS
   if unknown_tests:
     return sys.exit('Unknown tests %s' % list(unknown_tests))
 
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
+  if options.coverage_bucket:
+    setattr(options, 'coverage_dir',
+            os.path.join(CHROME_SRC, 'out', options.target, 'coverage'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))