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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
146 cmd = ['build/android/test_runner.py', 'gtest', '-s', suite] + args | 146 cmd = ['build/android/test_runner.py', 'gtest', '-s', suite] + args |
147 if suite == 'content_browsertests': | 147 if suite == 'content_browsertests': |
148 cmd.append('--num_retries=1') | 148 cmd.append('--num_retries=1') |
149 RunCmd(cmd) | 149 RunCmd(cmd) |
150 | 150 |
151 | 151 |
152 def RunChromeDriverTests(options): | 152 def RunChromeDriverTests(options): |
153 """Run all the steps for running chromedriver tests.""" | 153 """Run all the steps for running chromedriver tests.""" |
154 bb_annotations.PrintNamedStep('chromedriver_annotation') | 154 bb_annotations.PrintNamedStep('chromedriver_annotation') |
155 RunCmd(['chrome/test/chromedriver/run_buildbot_steps.py', | 155 RunCmd(['chrome/test/chromedriver/run_buildbot_steps.py', |
156 '--android-packages=%s,%s,%s' % | 156 '--android-packages=%s,%s,%s,%s' % |
157 (constants.PACKAGE_INFO['chromium_test_shell'].package, | 157 (constants.PACKAGE_INFO['chromium_test_shell'].package, |
158 constants.PACKAGE_INFO['chrome_stable'].package, | 158 constants.PACKAGE_INFO['chrome_stable'].package, |
159 constants.PACKAGE_INFO['chrome_beta'].package), | 159 constants.PACKAGE_INFO['chrome_beta'].package, |
160 'org.chromium.chromedriver_webview_shell'), | |
craigdh
2013/11/07 23:26:59
add this to constants.PACKAGE_INFO
craigdh
2013/11/07 23:26:59
Also, is the bot on KitKat yet?
frankf
2013/11/08 21:20:55
Done.
frankf
2013/11/08 21:20:55
No, I'll upgrade it before landing
| |
160 '--revision=%s' % _GetRevision(options), | 161 '--revision=%s' % _GetRevision(options), |
161 '--update-log']) | 162 '--update-log']) |
162 | 163 |
163 | 164 |
164 def InstallApk(options, test, print_step=False): | 165 def InstallApk(options, test, print_step=False): |
165 """Install an apk to all phones. | 166 """Install an apk to all phones. |
166 | 167 |
167 Args: | 168 Args: |
168 options: options object | 169 options: options object |
169 test: An I_TEST namedtuple | 170 test: An I_TEST namedtuple |
(...skipping 435 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 |