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

Unified Diff: build/android/pylib/perf/setup.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
« no previous file with comments | « build/android/pylib/perf/perf_control_unittest.py ('k') | build/android/pylib/uiautomator/setup.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/perf/setup.py
diff --git a/build/android/pylib/perf/setup.py b/build/android/pylib/perf/setup.py
index 8e1fc28a7e651bef567b336e5593d8be64c75701..8635aca921c12d5a2a7e4482e47cddb1f7a492a3 100644
--- a/build/android/pylib/perf/setup.py
+++ b/build/android/pylib/perf/setup.py
@@ -18,7 +18,7 @@ from pylib.perf import test_runner
from pylib.utils import test_environment
-def _GetAllDevices():
+def _GetAllDevices(active_devices):
devices_path = os.path.join(os.environ.get('CHROMIUM_OUT_DIR', 'out'),
device_list.LAST_DEVICES_FILENAME)
try:
@@ -26,7 +26,7 @@ def _GetAllDevices():
for s in device_list.GetPersistentDeviceList(devices_path)]
except IOError as e:
logging.error('Unable to find %s [%s]', devices_path, e)
- devices = device_utils.DeviceUtils.HealthyDevices()
+ devices = active_devices
return sorted(devices)
@@ -56,7 +56,7 @@ def _GetStepsDict(test_options):
return steps
-def Setup(test_options):
+def Setup(test_options, active_devices):
"""Create and return the test runner factory and tests.
Args:
@@ -72,10 +72,10 @@ def Setup(test_options):
os.makedirs(constants.PERF_OUTPUT_DIR)
# Before running the tests, kill any leftover server.
- test_environment.CleanupLeftoverProcesses()
+ test_environment.CleanupLeftoverProcesses(active_devices)
# We want to keep device affinity, so return all devices ever seen.
- all_devices = _GetAllDevices()
+ all_devices = _GetAllDevices(active_devices)
steps_dict = _GetStepsDict(test_options)
sorted_step_names = sorted(steps_dict['steps'].keys())
« no previous file with comments | « build/android/pylib/perf/perf_control_unittest.py ('k') | build/android/pylib/uiautomator/setup.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698