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 hashlib | 8 import hashlib |
9 import json | 9 import json |
10 import os | 10 import os |
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
439 provision_cmd.append('--auto-reconnect') | 439 provision_cmd.append('--auto-reconnect') |
440 if options.skip_wipe: | 440 if options.skip_wipe: |
441 provision_cmd.append('--skip-wipe') | 441 provision_cmd.append('--skip-wipe') |
442 if options.disable_location: | 442 if options.disable_location: |
443 provision_cmd.append('--disable-location') | 443 provision_cmd.append('--disable-location') |
444 RunCmd(provision_cmd, halt_on_failure=True) | 444 RunCmd(provision_cmd, halt_on_failure=True) |
445 | 445 |
446 | 446 |
447 def DeviceStatusCheck(options): | 447 def DeviceStatusCheck(options): |
448 bb_annotations.PrintNamedStep('device_status_check') | 448 bb_annotations.PrintNamedStep('device_status_check') |
449 cmd = ['build/android/buildbot/bb_device_status_check.py'] | 449 cmd = [ |
| 450 'build/android/buildbot/bb_device_status_check.py', |
| 451 '--blacklist-file', 'out/bad_devices.json', |
| 452 ] |
450 if options.restart_usb: | 453 if options.restart_usb: |
451 cmd.append('--restart-usb') | 454 cmd.append('--restart-usb') |
452 RunCmd(cmd, halt_on_failure=True) | 455 RunCmd(cmd, halt_on_failure=True) |
453 | 456 |
454 | 457 |
455 def GetDeviceSetupStepCmds(): | 458 def GetDeviceSetupStepCmds(): |
456 return [ | 459 return [ |
457 ('device_status_check', DeviceStatusCheck), | 460 ('device_status_check', DeviceStatusCheck), |
458 ('provision_devices', ProvisionDevices), | 461 ('provision_devices', ProvisionDevices), |
459 ] | 462 ] |
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
733 | 736 |
734 if options.coverage_bucket: | 737 if options.coverage_bucket: |
735 setattr(options, 'coverage_dir', | 738 setattr(options, 'coverage_dir', |
736 os.path.join(CHROME_OUT_DIR, options.target, 'coverage')) | 739 os.path.join(CHROME_OUT_DIR, options.target, 'coverage')) |
737 | 740 |
738 MainTestWrapper(options) | 741 MainTestWrapper(options) |
739 | 742 |
740 | 743 |
741 if __name__ == '__main__': | 744 if __name__ == '__main__': |
742 sys.exit(main(sys.argv)) | 745 sys.exit(main(sys.argv)) |
OLD | NEW |