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

Side by Side Diff: build/android/buildbot/bb_device_steps.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 unified diff | Download patch
« no previous file with comments | « build/android/buildbot/bb_device_status_check.py ('k') | build/android/enable_asserts.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 import collections 6 import collections
7 import glob 7 import glob
8 import hashlib 8 import hashlib
9 import json 9 import json
10 import os 10 import os
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 '--update-log']) 206 '--update-log'])
207 207
208 def RunChromeProxyTests(options): 208 def RunChromeProxyTests(options):
209 """Run the chrome_proxy tests. 209 """Run the chrome_proxy tests.
210 210
211 Args: 211 Args:
212 options: options object. 212 options: options object.
213 """ 213 """
214 InstallApk(options, INSTRUMENTATION_TESTS['ChromeShell'], False) 214 InstallApk(options, INSTRUMENTATION_TESTS['ChromeShell'], False)
215 args = ['--browser', 'android-chrome-shell'] 215 args = ['--browser', 'android-chrome-shell']
216 devices = device_utils.DeviceUtils.HealthyDevices() 216 devices = device_utils.DeviceUtils.HealthyDevices(blacklist=None)
217 if devices: 217 if devices:
218 args = args + ['--device', devices[0].adb.GetDeviceSerial()] 218 args = args + ['--device', devices[0].adb.GetDeviceSerial()]
219 bb_annotations.PrintNamedStep('chrome_proxy') 219 bb_annotations.PrintNamedStep('chrome_proxy')
220 RunCmd(['tools/chrome_proxy/run_tests'] + args) 220 RunCmd(['tools/chrome_proxy/run_tests'] + args)
221 221
222 222
223 def RunTelemetryTests(options, step_name, run_tests_path): 223 def RunTelemetryTests(options, step_name, run_tests_path):
224 """Runs either telemetry_perf_unittests or telemetry_unittests. 224 """Runs either telemetry_perf_unittests or telemetry_unittests.
225 225
226 Args: 226 Args:
227 options: options object. 227 options: options object.
228 step_name: either 'telemetry_unittests' or 'telemetry_perf_unittests' 228 step_name: either 'telemetry_unittests' or 'telemetry_perf_unittests'
229 run_tests_path: path to run_tests script (tools/perf/run_tests for 229 run_tests_path: path to run_tests script (tools/perf/run_tests for
230 perf_unittests and tools/telemetry/run_tests for 230 perf_unittests and tools/telemetry/run_tests for
231 telemetry_unittests) 231 telemetry_unittests)
232 """ 232 """
233 InstallApk(options, INSTRUMENTATION_TESTS['ChromeShell'], False) 233 InstallApk(options, INSTRUMENTATION_TESTS['ChromeShell'], False)
234 args = ['--browser', 'android-chrome-shell'] 234 args = ['--browser', 'android-chrome-shell']
235 devices = device_utils.DeviceUtils.HealthyDevices() 235 devices = device_utils.DeviceUtils.HealthyDevices(blacklist=None)
236 if devices: 236 if devices:
237 args = args + ['--device', 'android'] 237 args = args + ['--device', 'android']
238 bb_annotations.PrintNamedStep(step_name) 238 bb_annotations.PrintNamedStep(step_name)
239 RunCmd([run_tests_path] + args) 239 RunCmd([run_tests_path] + args)
240 240
241 241
242 def InstallApk(options, test, print_step=False): 242 def InstallApk(options, test, print_step=False):
243 """Install an apk to all phones. 243 """Install an apk to all phones.
244 244
245 Args: 245 Args:
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after
786 786
787 if options.coverage_bucket: 787 if options.coverage_bucket:
788 setattr(options, 'coverage_dir', 788 setattr(options, 'coverage_dir',
789 os.path.join(CHROME_OUT_DIR, options.target, 'coverage')) 789 os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
790 790
791 MainTestWrapper(options) 791 MainTestWrapper(options)
792 792
793 793
794 if __name__ == '__main__': 794 if __name__ == '__main__':
795 sys.exit(main(sys.argv)) 795 sys.exit(main(sys.argv))
OLDNEW
« no previous file with comments | « build/android/buildbot/bb_device_status_check.py ('k') | build/android/enable_asserts.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698