| 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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 'name', 'apk', 'apk_package']) | 88 'name', 'apk', 'apk_package']) |
| 89 | 89 |
| 90 INSTALLABLE_PACKAGES = dict((package.name, package) for package in ( | 90 INSTALLABLE_PACKAGES = dict((package.name, package) for package in ( |
| 91 [InstallablePackage(i.name, i.apk, i.apk_package) | 91 [InstallablePackage(i.name, i.apk, i.apk_package) |
| 92 for i in INSTRUMENTATION_TESTS.itervalues()] + | 92 for i in INSTRUMENTATION_TESTS.itervalues()] + |
| 93 [InstallablePackage('ChromeDriverWebViewShell', | 93 [InstallablePackage('ChromeDriverWebViewShell', |
| 94 'ChromeDriverWebViewShell.apk', | 94 'ChromeDriverWebViewShell.apk', |
| 95 'org.chromium.chromedriver_webview_shell')])) | 95 'org.chromium.chromedriver_webview_shell')])) |
| 96 | 96 |
| 97 VALID_TESTS = set(['chromedriver', 'chrome_proxy', 'components_browsertests', | 97 VALID_TESTS = set(['chromedriver', 'chrome_proxy', 'components_browsertests', |
| 98 'gpu', 'python_unittests', 'telemetry_unittests', | 98 'gfx_unittests', 'gpu', 'python_unittests', |
| 99 'telemetry_perf_unittests', 'ui', 'unit', 'webkit', | 99 'telemetry_unittests', 'telemetry_perf_unittests', 'ui', |
| 100 'webkit_layout']) | 100 'unit', 'webkit', 'webkit_layout']) |
| 101 | 101 |
| 102 RunCmd = bb_utils.RunCmd | 102 RunCmd = bb_utils.RunCmd |
| 103 | 103 |
| 104 | 104 |
| 105 def _GetRevision(options): | 105 def _GetRevision(options): |
| 106 """Get the SVN revision number. | 106 """Get the SVN revision number. |
| 107 | 107 |
| 108 Args: | 108 Args: |
| 109 options: options object. | 109 options: options object. |
| 110 | 110 |
| (...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 564 | 564 |
| 565 | 565 |
| 566 def GetTestStepCmds(): | 566 def GetTestStepCmds(): |
| 567 return [ | 567 return [ |
| 568 ('base_junit_tests', | 568 ('base_junit_tests', |
| 569 lambda _options: RunJunitSuite('base_junit_tests')), | 569 lambda _options: RunJunitSuite('base_junit_tests')), |
| 570 ('chromedriver', RunChromeDriverTests), | 570 ('chromedriver', RunChromeDriverTests), |
| 571 ('chrome_proxy', RunChromeProxyTests), | 571 ('chrome_proxy', RunChromeProxyTests), |
| 572 ('components_browsertests', | 572 ('components_browsertests', |
| 573 lambda options: RunTestSuites(options, ['components_browsertests'])), | 573 lambda options: RunTestSuites(options, ['components_browsertests'])), |
| 574 ('gfx_unittests', |
| 575 lambda options: RunTestSuites(options, ['gfx_unittests'])), |
| 574 ('gpu', RunGPUTests), | 576 ('gpu', RunGPUTests), |
| 575 ('python_unittests', RunPythonUnitTests), | 577 ('python_unittests', RunPythonUnitTests), |
| 576 ('telemetry_unittests', RunTelemetryUnitTests), | 578 ('telemetry_unittests', RunTelemetryUnitTests), |
| 577 ('telemetry_perf_unittests', RunTelemetryPerfUnitTests), | 579 ('telemetry_perf_unittests', RunTelemetryPerfUnitTests), |
| 578 ('ui', RunInstrumentationTests), | 580 ('ui', RunInstrumentationTests), |
| 579 ('unit', RunUnitTests), | 581 ('unit', RunUnitTests), |
| 580 ('webkit', RunWebkitTests), | 582 ('webkit', RunWebkitTests), |
| 581 ('webkit_layout', RunWebkitLayoutTests), | 583 ('webkit_layout', RunWebkitLayoutTests), |
| 582 ] | 584 ] |
| 583 | 585 |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 771 | 773 |
| 772 if options.coverage_bucket: | 774 if options.coverage_bucket: |
| 773 setattr(options, 'coverage_dir', | 775 setattr(options, 'coverage_dir', |
| 774 os.path.join(CHROME_OUT_DIR, options.target, 'coverage')) | 776 os.path.join(CHROME_OUT_DIR, options.target, 'coverage')) |
| 775 | 777 |
| 776 MainTestWrapper(options) | 778 MainTestWrapper(options) |
| 777 | 779 |
| 778 | 780 |
| 779 if __name__ == '__main__': | 781 if __name__ == '__main__': |
| 780 sys.exit(main(sys.argv)) | 782 sys.exit(main(sys.argv)) |
| OLD | NEW |