| 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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 cmd = ['build/android/test_runner.py', 'gtest', '-s', suite] + args | 148 cmd = ['build/android/test_runner.py', 'gtest', '-s', suite] + args |
| 149 if suite == 'content_browsertests': | 149 if suite == 'content_browsertests': |
| 150 cmd.append('--num_retries=1') | 150 cmd.append('--num_retries=1') |
| 151 RunCmd(cmd) | 151 RunCmd(cmd) |
| 152 | 152 |
| 153 | 153 |
| 154 def RunChromeDriverTests(options): | 154 def RunChromeDriverTests(options): |
| 155 """Run all the steps for running chromedriver tests.""" | 155 """Run all the steps for running chromedriver tests.""" |
| 156 bb_annotations.PrintNamedStep('chromedriver_annotation') | 156 bb_annotations.PrintNamedStep('chromedriver_annotation') |
| 157 RunCmd(['chrome/test/chromedriver/run_buildbot_steps.py', | 157 RunCmd(['chrome/test/chromedriver/run_buildbot_steps.py', |
| 158 '--android-packages=%s,%s,%s' % | 158 '--android-packages=%s,%s,%s,%s' % |
| 159 ('chromium_test_shell', | 159 ('chromium_test_shell', |
| 160 'chrome_stable', | 160 'chrome_stable', |
| 161 'chrome_beta'), | 161 'chrome_beta', |
| 162 'chromedriver_webview_shell'), |
| 162 '--revision=%s' % _GetRevision(options), | 163 '--revision=%s' % _GetRevision(options), |
| 163 '--update-log']) | 164 '--update-log']) |
| 164 | 165 |
| 165 | 166 |
| 166 def InstallApk(options, test, print_step=False): | 167 def InstallApk(options, test, print_step=False): |
| 167 """Install an apk to all phones. | 168 """Install an apk to all phones. |
| 168 | 169 |
| 169 Args: | 170 Args: |
| 170 options: options object | 171 options: options object |
| 171 test: An I_TEST namedtuple | 172 test: An I_TEST namedtuple |
| (...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 605 setattr(options, 'target', options.factory_properties.get('target', 'Debug')) | 606 setattr(options, 'target', options.factory_properties.get('target', 'Debug')) |
| 606 if options.coverage_bucket: | 607 if options.coverage_bucket: |
| 607 setattr(options, 'coverage_dir', | 608 setattr(options, 'coverage_dir', |
| 608 os.path.join(CHROME_OUT_DIR, options.target, 'coverage')) | 609 os.path.join(CHROME_OUT_DIR, options.target, 'coverage')) |
| 609 | 610 |
| 610 MainTestWrapper(options) | 611 MainTestWrapper(options) |
| 611 | 612 |
| 612 | 613 |
| 613 if __name__ == '__main__': | 614 if __name__ == '__main__': |
| 614 sys.exit(main(sys.argv)) | 615 sys.exit(main(sys.argv)) |
| OLD | NEW |