| OLD | NEW |
| 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 multiprocessing | 8 import multiprocessing |
| 9 import os | 9 import os |
| 10 import shutil | 10 import shutil |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 253 if options.reboot: | 253 if options.reboot: |
| 254 RebootDevices() | 254 RebootDevices() |
| 255 provision_cmd = ['build/android/provision_devices.py', '-t', options.target] | 255 provision_cmd = ['build/android/provision_devices.py', '-t', options.target] |
| 256 if options.auto_reconnect: | 256 if options.auto_reconnect: |
| 257 provision_cmd.append('--auto-reconnect') | 257 provision_cmd.append('--auto-reconnect') |
| 258 RunCmd(provision_cmd) | 258 RunCmd(provision_cmd) |
| 259 | 259 |
| 260 | 260 |
| 261 def DeviceStatusCheck(_): | 261 def DeviceStatusCheck(_): |
| 262 bb_annotations.PrintNamedStep('device_status_check') | 262 bb_annotations.PrintNamedStep('device_status_check') |
| 263 RunCmd(['build/android/device_status_check.py'], halt_on_failure=True) | 263 RunCmd(['build/android/buildbot/bb_device_status_check.py'], |
| 264 halt_on_failure=True) |
| 264 | 265 |
| 265 | 266 |
| 266 def GetDeviceSetupStepCmds(): | 267 def GetDeviceSetupStepCmds(): |
| 267 return [ | 268 return [ |
| 268 ('provision_devices', ProvisionDevices), | 269 ('provision_devices', ProvisionDevices), |
| 269 ('device_status_check', DeviceStatusCheck) | 270 ('device_status_check', DeviceStatusCheck) |
| 270 ] | 271 ] |
| 271 | 272 |
| 272 | 273 |
| 273 def RunUnitTests(options): | 274 def RunUnitTests(options): |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 381 return sys.exit('Unknown tests %s' % list(unknown_tests)) | 382 return sys.exit('Unknown tests %s' % list(unknown_tests)) |
| 382 | 383 |
| 383 setattr(options, 'target', options.factory_properties.get('target', 'Debug')) | 384 setattr(options, 'target', options.factory_properties.get('target', 'Debug')) |
| 384 | 385 |
| 385 MainTestWrapper(options) | 386 MainTestWrapper(options) |
| 386 provision_devices.KillHostHeartbeat() | 387 provision_devices.KillHostHeartbeat() |
| 387 | 388 |
| 388 | 389 |
| 389 if __name__ == '__main__': | 390 if __name__ == '__main__': |
| 390 sys.exit(main(sys.argv)) | 391 sys.exit(main(sys.argv)) |
| OLD | NEW |