build/android/pylib/instrumentation/setup.py - Issue 20210002: [Android] Sets up a coverage system for java using EMMA

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/pylib/instrumentation/setup.py

Issue 20210002: [Android] Sets up a coverage system for java using EMMA (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Gets code coverage for non-apk java working Created 7 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« build/android/generate_emma_html.py ('K') | « build/android/gyp/dex.py ('k') | build/android/pylib/instrumentation/test_runner.py » ('j') | build/android/pylib/instrumentation/test_runner.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/pylib/instrumentation/setup.py

diff --git a/build/android/pylib/instrumentation/setup.py b/build/android/pylib/instrumentation/setup.py

index 1c09acfd4fc15b3fe39e2ca099d7f57add9b5fde..3f55fed70630d44177dec37fda2719facbadad37 100644

--- a/build/android/pylib/instrumentation/setup.py

+++ b/build/android/pylib/instrumentation/setup.py

@@ -19,7 +19,7 @@ import test_runner

def Setup(test_apk_path, test_apk_jar_path, annotations, exclude_annotations,

test_filter, build_type, test_data, save_perf_json,

screenshot_failures, tool, wait_for_debugger, disable_assertions,

- push_deps, cleanup_test_files):

+ push_deps, cleanup_test_files, coverage_dir):

"""Create and return the test runner factory and tests.

Args:

@@ -37,6 +37,8 @@ def Setup(test_apk_path, test_apk_jar_path, annotations, exclude_annotations,

disable_assertions: Whether to disable java assertions on the device.

push_deps: If True, push all dependencies to the device.

cleanup_test_files: Whether or not to cleanup test files on device.

+ coverage_dir: Directory to pull all EMMA coverage files into, or None if

+ coverage is not being used.

Returns:

A tuple of (TestRunnerFactory, tests).

@@ -51,6 +53,6 @@ def Setup(test_apk_path, test_apk_jar_path, annotations, exclude_annotations,

return test_runner.TestRunner(

build_type, test_data, save_perf_json, screenshot_failures,

tool, wait_for_debugger, disable_assertions, push_deps,

- cleanup_test_files, device, shard_index, test_pkg, [])

+ cleanup_test_files, device, shard_index, test_pkg, [], coverage_dir)

return (TestRunnerFactory, tests)