| 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 multiprocessing | 10 import multiprocessing |
| (...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 413 def DeviceStatusCheck(options): | 413 def DeviceStatusCheck(options): |
| 414 bb_annotations.PrintNamedStep('device_status_check') | 414 bb_annotations.PrintNamedStep('device_status_check') |
| 415 cmd = ['build/android/buildbot/bb_device_status_check.py'] | 415 cmd = ['build/android/buildbot/bb_device_status_check.py'] |
| 416 if options.restart_usb: | 416 if options.restart_usb: |
| 417 cmd.append('--restart-usb') | 417 cmd.append('--restart-usb') |
| 418 RunCmd(cmd, halt_on_failure=True) | 418 RunCmd(cmd, halt_on_failure=True) |
| 419 | 419 |
| 420 | 420 |
| 421 def GetDeviceSetupStepCmds(): | 421 def GetDeviceSetupStepCmds(): |
| 422 return [ | 422 return [ |
| 423 ('device_status_check', DeviceStatusCheck), |
| 423 ('provision_devices', ProvisionDevices), | 424 ('provision_devices', ProvisionDevices), |
| 424 ('device_status_check', DeviceStatusCheck), | |
| 425 ] | 425 ] |
| 426 | 426 |
| 427 | 427 |
| 428 def RunUnitTests(options): | 428 def RunUnitTests(options): |
| 429 RunTestSuites(options, gtest_config.STABLE_TEST_SUITES) | 429 RunTestSuites(options, gtest_config.STABLE_TEST_SUITES) |
| 430 | 430 |
| 431 | 431 |
| 432 def RunInstrumentationTests(options): | 432 def RunInstrumentationTests(options): |
| 433 for test in INSTRUMENTATION_TESTS.itervalues(): | 433 for test in INSTRUMENTATION_TESTS.itervalues(): |
| 434 RunInstrumentationSuite(options, test) | 434 RunInstrumentationSuite(options, test) |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 606 setattr(options, 'target', options.factory_properties.get('target', 'Debug')) | 606 setattr(options, 'target', options.factory_properties.get('target', 'Debug')) |
| 607 if options.coverage_bucket: | 607 if options.coverage_bucket: |
| 608 setattr(options, 'coverage_dir', | 608 setattr(options, 'coverage_dir', |
| 609 os.path.join(CHROME_OUT_DIR, options.target, 'coverage')) | 609 os.path.join(CHROME_OUT_DIR, options.target, 'coverage')) |
| 610 | 610 |
| 611 MainTestWrapper(options) | 611 MainTestWrapper(options) |
| 612 | 612 |
| 613 | 613 |
| 614 if __name__ == '__main__': | 614 if __name__ == '__main__': |
| 615 sys.exit(main(sys.argv)) | 615 sys.exit(main(sys.argv)) |
| OLD | NEW |