| 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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 for suite in suites: | 172 for suite in suites: |
| 173 bb_annotations.PrintNamedStep(suite) | 173 bb_annotations.PrintNamedStep(suite) |
| 174 cmd = [suite] + args | 174 cmd = [suite] + args |
| 175 cmd += suites_options.get(suite, []) | 175 cmd += suites_options.get(suite, []) |
| 176 if suite == 'content_browsertests' or suite == 'components_browsertests': | 176 if suite == 'content_browsertests' or suite == 'components_browsertests': |
| 177 cmd.append('--num_retries=1') | 177 cmd.append('--num_retries=1') |
| 178 _RunTest(options, cmd, suite) | 178 _RunTest(options, cmd, suite) |
| 179 | 179 |
| 180 | 180 |
| 181 def RunJunitSuite(suite): | 181 def RunJunitSuite(suite): |
| 182 bb_annotations.PrintNamedStep(suite) |
| 182 RunCmd(['build/android/test_runner.py', 'junit', '-s', suite]) | 183 RunCmd(['build/android/test_runner.py', 'junit', '-s', suite]) |
| 183 | 184 |
| 184 | 185 |
| 185 def RunChromeDriverTests(options): | 186 def RunChromeDriverTests(options): |
| 186 """Run all the steps for running chromedriver tests.""" | 187 """Run all the steps for running chromedriver tests.""" |
| 187 bb_annotations.PrintNamedStep('chromedriver_annotation') | 188 bb_annotations.PrintNamedStep('chromedriver_annotation') |
| 188 RunCmd(['chrome/test/chromedriver/run_buildbot_steps.py', | 189 RunCmd(['chrome/test/chromedriver/run_buildbot_steps.py', |
| 189 '--android-packages=%s,%s,%s,%s' % | 190 '--android-packages=%s,%s,%s,%s' % |
| 190 ('chrome_shell', | 191 ('chrome_shell', |
| 191 'chrome_stable', | 192 'chrome_stable', |
| (...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 773 | 774 |
| 774 if options.coverage_bucket: | 775 if options.coverage_bucket: |
| 775 setattr(options, 'coverage_dir', | 776 setattr(options, 'coverage_dir', |
| 776 os.path.join(CHROME_OUT_DIR, options.target, 'coverage')) | 777 os.path.join(CHROME_OUT_DIR, options.target, 'coverage')) |
| 777 | 778 |
| 778 MainTestWrapper(options) | 779 MainTestWrapper(options) |
| 779 | 780 |
| 780 | 781 |
| 781 if __name__ == '__main__': | 782 if __name__ == '__main__': |
| 782 sys.exit(main(sys.argv)) | 783 sys.exit(main(sys.argv)) |
| OLD | NEW |