| 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 multiprocessing | 9 import multiprocessing |
| 10 import os | 10 import os |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 # TODO(dpranke): Remove this block after | 242 # TODO(dpranke): Remove this block after |
| 243 # https://codereview.chromium.org/12927002/ lands. | 243 # https://codereview.chromium.org/12927002/ lands. |
| 244 for f in options.factory_properties.get('additional_expectations_files', []): | 244 for f in options.factory_properties.get('additional_expectations_files', []): |
| 245 cmd_args.extend( | 245 cmd_args.extend( |
| 246 ['--additional-expectations=%s' % os.path.join(CHROME_SRC_DIR, *f)]) | 246 ['--additional-expectations=%s' % os.path.join(CHROME_SRC_DIR, *f)]) |
| 247 | 247 |
| 248 RunCmd(['webkit/tools/layout_tests/run_webkit_tests.py'] + cmd_args) | 248 RunCmd(['webkit/tools/layout_tests/run_webkit_tests.py'] + cmd_args) |
| 249 | 249 |
| 250 if options.factory_properties.get('archive_webkit_results', False): | 250 if options.factory_properties.get('archive_webkit_results', False): |
| 251 bb_annotations.PrintNamedStep('archive_webkit_results') | 251 bb_annotations.PrintNamedStep('archive_webkit_results') |
| 252 gs_bucket = 'https://storage.googleapis.com/chromium-layout-test-archives' | 252 gs_bucket = 'gs://chromium-layout-test-archives' |
| 253 RunCmd([os.path.join(SLAVE_SCRIPTS_DIR, 'chromium', | 253 RunCmd([os.path.join(SLAVE_SCRIPTS_DIR, 'chromium', |
| 254 'archive_layout_test_results.py'), | 254 'archive_layout_test_results.py'), |
| 255 '--results-dir', '../layout-test-results', | 255 '--results-dir', '../layout-test-results', |
| 256 '--build-dir', CHROME_OUT_DIR, | 256 '--build-dir', CHROME_OUT_DIR, |
| 257 '--build-number', str(options.build_properties.get('buildnumber', '')), | 257 '--build-number', str(options.build_properties.get('buildnumber', '')), |
| 258 '--builder-name', options.build_properties.get('buildername', ''), | 258 '--builder-name', options.build_properties.get('buildername', ''), |
| 259 '--gs-bucket', gs_bucket]) | 259 '--gs-bucket', gs_bucket]) |
| 260 | 260 |
| 261 | 261 |
| 262 def SpawnLogcatMonitor(): | 262 def SpawnLogcatMonitor(): |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 469 setattr(options, 'target', options.factory_properties.get('target', 'Debug')) | 469 setattr(options, 'target', options.factory_properties.get('target', 'Debug')) |
| 470 if options.coverage_bucket: | 470 if options.coverage_bucket: |
| 471 setattr(options, 'coverage_dir', | 471 setattr(options, 'coverage_dir', |
| 472 os.path.join(CHROME_OUT_DIR, options.target, 'coverage')) | 472 os.path.join(CHROME_OUT_DIR, options.target, 'coverage')) |
| 473 | 473 |
| 474 MainTestWrapper(options) | 474 MainTestWrapper(options) |
| 475 | 475 |
| 476 | 476 |
| 477 if __name__ == '__main__': | 477 if __name__ == '__main__': |
| 478 sys.exit(main(sys.argv)) | 478 sys.exit(main(sys.argv)) |
| OLD | NEW |