Index: build/android/pylib/instrumentation/setup.py |
diff --git a/build/android/pylib/instrumentation/setup.py b/build/android/pylib/instrumentation/setup.py |
index 628adbcb52e997aa0975ef43be54a7e5d637b275..4bce636b2518dc405cdc326a2d9c0d8d7fd77e82 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, install_apk, 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: |
@@ -38,6 +38,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). |
@@ -52,6 +54,6 @@ def Setup(test_apk_path, test_apk_jar_path, annotations, exclude_annotations, |
return test_runner.TestRunner( |
build_type, test_data, install_apk, 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) |