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

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 multiprocessing
 import os
 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
 
 
+SLAVE_SCRIPTS_DIR = os.path.join(bb_utils.BB_BUILD_DIR, 'scripts', 'slave')
 CHROME_SRC = constants.DIR_SOURCE_ROOT
 LOGCAT_DIR = os.path.join(CHROME_SRC, 'out', 'logcat')
+COVERAGE_DIR = os.path.join(CHROME_SRC, 'out', 'coverage')

[frankf, 2013/08/13 23:33:39]

Move this to constants.py

[gkanwar1, 2013/08/15 19:49:20]

Done.

+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.
 I_TEST = collections.namedtuple('InstrumentationTest', [
-    'name', 'apk', 'apk_package', 'test_apk', 'test_data', 'host_driven_root',
-    'annotation', 'exclude_annotation', 'extra_flags'])
+    'name', 'apk', 'apk_package', 'test_apk', 'test_data', 'coverage',
+    'host_driven_root', 'annotation', 'exclude_annotation', 'extra_flags'])
 
-def I(name, apk, apk_package, test_apk, test_data, host_driven_root=None,
-      annotation=None, exclude_annotation=None, extra_flags=None):
-  return I_TEST(name, apk, apk_package, test_apk, test_data, host_driven_root,
-                annotation, exclude_annotation, extra_flags)
+def I(name, apk, apk_package, test_apk, test_data, coverage=False,
+      host_driven_root=None, annotation=None, exclude_annotation=None,
+      extra_flags=None):
+  return I_TEST(name, apk, apk_package, test_apk, test_data, coverage,
+                host_driven_root, annotation, exclude_annotation, extra_flags)
 
 INSTRUMENTATION_TESTS = dict((suite.name, suite) for suite in [
     I('ContentShell',
       'ContentShell.apk',
       'org.chromium.content_shell_apk',
       'ContentShellTest',
-      'content:content/test/data/android/device_files'),
+      'content:content/test/data/android/device_files',
+      coverage=True),
     I('ChromiumTestShell',
       'ChromiumTestShell.apk',
       'org.chromium.chrome.testshell',
       'ChromiumTestShellTest',
       'chrome:chrome/test/data/android/device_files',
-      constants.CHROMIUM_TEST_SHELL_HOST_DRIVEN_DIR),
+      host_driven_root=constants.CHROMIUM_TEST_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', 'ui', 'unit', 'webkit', 'webkit_layout',
                    'webrtc'])
 
@@ skipping 88 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 and test.coverage:
+    args.append('--coverage-dir=%s' % COVERAGE_DIR)
   if test.host_driven_root:
     args.append('--python_test_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 87 matching lines @@
 
 
 def RunUnitTests(options):
   RunTestSuites(options, gtest_config.STABLE_TEST_SUITES)
 
 
 def RunInstrumentationTests(options):
   for test in INSTRUMENTATION_TESTS.itervalues():
     RunInstrumentationSuite(options, test)
 
+  if options.coverage_bucket:
+    shutil.rmtree(COVERAGE_DIR, ignore_errors=True)
+    os.mkdir(COVERAGE_DIR)
+    RunCmd(['build/android/generate_emma_html.py',
+            '--coverage-dir', COVERAGE_DIR,
+            '--metadata-dir', os.path.join('out', options.target),

[frankf, 2013/08/13 23:33:39]

How does this work? Did yo forget constants.DIR_SOURCE_ROOT?

[gkanwar1, 2013/08/15 19:49:20]

It's relative to the python running directory, which is at DIR_SOURCE_ROOT.
Still worth making this more explicit, so I added that.

+            '--output', os.path.join(COVERAGE_DIR, 'coverage.html')])
+    revision_file = os.path.join(CHROME_SRC, 'out', options.target,
+                                 REVISION_FILENAME)
+
+    # If the revision file doesn't exist, we're just testing the bot
+    if os.path.exists(revision_file):
+      with open(revision_file) as f:
+        revision = f.read()
+    else:
+      revision = 'testing'
+
+    RunCmd([os.path.join(bb_utils.BB_BUILD_DIR, 'scripts',
+                         'slave', 'gsutil_cp_dir.py'),
+            os.path.join(COVERAGE_DIR), 'gs://%s/%s' %
+            (options.coverage_bucket, revision)])

[frankf, 2013/08/13 23:33:39]

As it stands, you're going to upload from all fyi bots and trybots. Can this
conflict?

[gkanwar1, 2013/08/15 19:49:20]

Yep, good point. Changing url to gs://<bucket>/<bot-id>/<rev-id>.

+    bb_annotations.PrintLink(
+        'Coverage report',
+        'https://storage.googleapis.com/%s/%s/coverage.html'
+        % (options.coverage_bucket, revision))
+
 
 def RunWebkitTests(options):
   RunTestSuites(options, ['webkit_unit_tests'])
   RunWebkitLint(options.target)
 
 
 def RunWebRTCTests(options):
   RunTestSuites(options, gtest_config.WEBRTC_TEST_SUITES)
 
 
@@ skipping 61 matching lines @@
                     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')
@@ skipping 12 matching lines @@
   if unknown_tests:
     return sys.exit('Unknown tests %s' % list(unknown_tests))
 
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))