| 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 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 256 ['--additional-expectations=%s' % os.path.join(CHROME_SRC_DIR, *f)]) | 256 ['--additional-expectations=%s' % os.path.join(CHROME_SRC_DIR, *f)]) |
| 257 | 257 |
| 258 # TODO(dpranke): Remove this block after | 258 # TODO(dpranke): Remove this block after |
| 259 # https://codereview.chromium.org/12927002/ lands. | 259 # https://codereview.chromium.org/12927002/ lands. |
| 260 for f in options.factory_properties.get('additional_expectations_files', []): | 260 for f in options.factory_properties.get('additional_expectations_files', []): |
| 261 cmd_args.extend( | 261 cmd_args.extend( |
| 262 ['--additional-expectations=%s' % os.path.join(CHROME_SRC_DIR, *f)]) | 262 ['--additional-expectations=%s' % os.path.join(CHROME_SRC_DIR, *f)]) |
| 263 | 263 |
| 264 exit_code = RunCmd(['webkit/tools/layout_tests/run_webkit_tests.py'] + | 264 exit_code = RunCmd(['webkit/tools/layout_tests/run_webkit_tests.py'] + |
| 265 cmd_args) | 265 cmd_args) |
| 266 if exit_code == 254: # AKA -1, internal error. | 266 if exit_code == 254: # test_run_results.UNEXPECTED_ERROR_EXIT_STATUS |
| 267 bb_annotations.PrintMsg('?? (crashed or hung)') | 267 bb_annotations.PrintMsg('?? (crashed or hung)') |
| 268 elif exit_code == 253: # test_run_results.NO_DEVICES_EXIT_STATUS |
| 269 bb_annotations.PrintMsg('?? (no devices found)') |
| 270 elif exit_code == 252: # test_run_results.NO_TESTS_EXIT_STATUS |
| 271 bb_annotations.PrintMsg('?? (no tests found)') |
| 268 else: | 272 else: |
| 269 full_results_path = os.path.join('..', 'layout-test-results', | 273 full_results_path = os.path.join('..', 'layout-test-results', |
| 270 'full_results.json') | 274 'full_results.json') |
| 271 if os.path.exists(full_results_path): | 275 if os.path.exists(full_results_path): |
| 272 full_results = json.load(open(full_results_path)) | 276 full_results = json.load(open(full_results_path)) |
| 273 unexpected_passes, unexpected_failures, unexpected_flakes = ( | 277 unexpected_passes, unexpected_failures, unexpected_flakes = ( |
| 274 _ParseLayoutTestResults(full_results)) | 278 _ParseLayoutTestResults(full_results)) |
| 275 if unexpected_failures: | 279 if unexpected_failures: |
| 276 _PrintDashboardLink('failed', unexpected_failures, | 280 _PrintDashboardLink('failed', unexpected_failures, |
| 277 max_tests=25) | 281 max_tests=25) |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 578 setattr(options, 'target', options.factory_properties.get('target', 'Debug')) | 582 setattr(options, 'target', options.factory_properties.get('target', 'Debug')) |
| 579 if options.coverage_bucket: | 583 if options.coverage_bucket: |
| 580 setattr(options, 'coverage_dir', | 584 setattr(options, 'coverage_dir', |
| 581 os.path.join(CHROME_OUT_DIR, options.target, 'coverage')) | 585 os.path.join(CHROME_OUT_DIR, options.target, 'coverage')) |
| 582 | 586 |
| 583 MainTestWrapper(options) | 587 MainTestWrapper(options) |
| 584 | 588 |
| 585 | 589 |
| 586 if __name__ == '__main__': | 590 if __name__ == '__main__': |
| 587 sys.exit(main(sys.argv)) | 591 sys.exit(main(sys.argv)) |
| OLD | NEW |