Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

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

Issue 1281923003: [Android] Add --blacklist-file as a command-line option. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix telemetry_unittests Created 5 years, 4 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
Index: build/android/pylib/instrumentation/test_jar.py
diff --git a/build/android/pylib/instrumentation/test_jar.py b/build/android/pylib/instrumentation/test_jar.py
index 7ad8997755cc2c49763a51a946adb05604e21b19..179e6b1f9c6e8ed5015fddac5dcb15c60a7b31f7 100644
--- a/build/android/pylib/instrumentation/test_jar.py
+++ b/build/android/pylib/instrumentation/test_jar.py
@@ -170,7 +170,7 @@ class TestJar(object):
attached_min_sdk_level >= required_min_sdk_level)
def GetAllMatchingTests(self, annotation_filter_list,
- exclude_annotation_list, test_filter):
+ exclude_annotation_list, test_filter, devices):
"""Get a list of tests matching any of the annotations and the filter.
Args:
@@ -180,6 +180,7 @@ class TestJar(object):
exclude_annotation_list: List of test annotations. A test must not have
any of these annotations.
test_filter: Filter used for partial matching on the test method names.
+ devices: The set of devices against which tests will be run.
Returns:
List of all matching tests.
@@ -218,7 +219,7 @@ class TestJar(object):
# Filter out any tests with SDK level requirements that don't match the set
# of attached devices.
- devices = device_utils.DeviceUtils.parallel()
+ devices = device_utils.DeviceUtils.parallel(devices)
min_sdk_version = min(devices.build_version_sdk.pGet(None))
tests = [t for t in tests
if self._IsTestValidForSdkRange(t, min_sdk_version)]
« no previous file with comments | « build/android/pylib/instrumentation/setup.py ('k') | build/android/pylib/local/device/local_device_environment.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698