| 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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 bb_annotations.PrintNamedStep(suite) | 117 bb_annotations.PrintNamedStep(suite) |
| 118 cmd = ['build/android/test_runner.py', 'gtest', '-s', suite] + args | 118 cmd = ['build/android/test_runner.py', 'gtest', '-s', suite] + args |
| 119 if suite == 'content_browsertests': | 119 if suite == 'content_browsertests': |
| 120 cmd.append('--num_retries=1') | 120 cmd.append('--num_retries=1') |
| 121 RunCmd(cmd) | 121 RunCmd(cmd) |
| 122 | 122 |
| 123 def RunChromeDriverTests(_): | 123 def RunChromeDriverTests(_): |
| 124 """Run all the steps for running chromedriver tests.""" | 124 """Run all the steps for running chromedriver tests.""" |
| 125 bb_annotations.PrintNamedStep('chromedriver_annotation') | 125 bb_annotations.PrintNamedStep('chromedriver_annotation') |
| 126 RunCmd(['chrome/test/chromedriver/run_buildbot_steps.py', | 126 RunCmd(['chrome/test/chromedriver/run_buildbot_steps.py', |
| 127 '--android-package=%s' % constants.CHROMIUM_TEST_SHELL_PACKAGE]) | 127 '--android-packages=%s,%s,%s' % |
| 128 (constants.CHROMIUM_TEST_SHELL_PACKAGE, |
| 129 constants.CHROME_STABLE_PACKAGE, |
| 130 constants.CHROME_BETA_PACKAGE)]) |
| 128 | 131 |
| 129 def InstallApk(options, test, print_step=False): | 132 def InstallApk(options, test, print_step=False): |
| 130 """Install an apk to all phones. | 133 """Install an apk to all phones. |
| 131 | 134 |
| 132 Args: | 135 Args: |
| 133 options: options object | 136 options: options object |
| 134 test: An I_TEST namedtuple | 137 test: An I_TEST namedtuple |
| 135 print_step: Print a buildbot step | 138 print_step: Print a buildbot step |
| 136 """ | 139 """ |
| 137 if print_step: | 140 if print_step: |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 if unknown_tests: | 383 if unknown_tests: |
| 381 return sys.exit('Unknown tests %s' % list(unknown_tests)) | 384 return sys.exit('Unknown tests %s' % list(unknown_tests)) |
| 382 | 385 |
| 383 setattr(options, 'target', options.factory_properties.get('target', 'Debug')) | 386 setattr(options, 'target', options.factory_properties.get('target', 'Debug')) |
| 384 | 387 |
| 385 MainTestWrapper(options) | 388 MainTestWrapper(options) |
| 386 | 389 |
| 387 | 390 |
| 388 if __name__ == '__main__': | 391 if __name__ == '__main__': |
| 389 sys.exit(main(sys.argv)) | 392 sys.exit(main(sys.argv)) |
| OLD | NEW |