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)] |