| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 DEPS = [ | 5 DEPS = [ |
| 6 'chromium', | 6 'chromium', |
| 7 'gclient', | 7 'gclient', |
| 8 'json', | 8 'json', |
| 9 'path', | 9 'path', |
| 10 'platform', | 10 'platform', |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 'test_webkitpy_wrapper.py') | 73 'test_webkitpy_wrapper.py') |
| 74 results_dir = api.path.slave_build('layout-test-results') | 74 results_dir = api.path.slave_build('layout-test-results') |
| 75 | 75 |
| 76 | 76 |
| 77 def BlinkTestsStep(with_patch): | 77 def BlinkTestsStep(with_patch): |
| 78 name = 'webkit_tests (with%s patch)' % ('' if with_patch else 'out') | 78 name = 'webkit_tests (with%s patch)' % ('' if with_patch else 'out') |
| 79 test = api.path.build('scripts', 'slave', 'chromium', | 79 test = api.path.build('scripts', 'slave', 'chromium', |
| 80 'layout_test_wrapper.py') | 80 'layout_test_wrapper.py') |
| 81 args = ['--target', api.chromium.c.BUILD_CONFIG, | 81 args = ['--target', api.chromium.c.BUILD_CONFIG, |
| 82 '-o', results_dir, | 82 '-o', results_dir, |
| 83 '--build-dir', api.path.checkout(api.chromium.c.build_dir), | 83 '--build-dir', api.chromium.c.build_dir, |
| 84 '--json-test-results', api.json.test_results()] | 84 '--json-test-results', api.json.test_results()] |
| 85 return api.chromium.runtests(test, args, name=name, can_fail_build=False, | 85 return api.chromium.runtests(test, args, name=name, can_fail_build=False, |
| 86 followup_fn=followup_fn) | 86 followup_fn=followup_fn) |
| 87 | 87 |
| 88 yield ( | 88 yield ( |
| 89 api.gclient.checkout(), | 89 api.gclient.checkout(), |
| 90 api.rietveld.apply_issue('third_party', 'WebKit'), | 90 api.rietveld.apply_issue('third_party', 'WebKit'), |
| 91 api.chromium.runhooks(), | 91 api.chromium.runhooks(), |
| 92 api.chromium.compile(), | 92 api.chromium.compile(), |
| 93 api.python('webkit_lint', webkit_lint, [ | 93 api.python('webkit_lint', webkit_lint, [ |
| (...skipping 21 matching lines...) Expand all Loading... |
| 115 step_result.presentation.links['layout_test_results'] = ( | 115 step_result.presentation.links['layout_test_results'] = ( |
| 116 base + '/layout-test-results/results.html') | 116 base + '/layout-test-results/results.html') |
| 117 step_result.presentation.links['(zip)'] = ( | 117 step_result.presentation.links['(zip)'] = ( |
| 118 base + '/layout-test-results.zip') | 118 base + '/layout-test-results.zip') |
| 119 | 119 |
| 120 yield api.python( | 120 yield api.python( |
| 121 'archive_webkit_tests_results', | 121 'archive_webkit_tests_results', |
| 122 archive_layout_test_results, | 122 archive_layout_test_results, |
| 123 [ | 123 [ |
| 124 '--results-dir', results_dir, | 124 '--results-dir', results_dir, |
| 125 '--build-dir', api.path.checkout(api.chromium.c.build_dir), | 125 '--build-dir', api.chromium.c.build_dir, |
| 126 '--build-number', buildnumber, | 126 '--build-number', buildnumber, |
| 127 '--builder-name', buildername, | 127 '--builder-name', buildername, |
| 128 '--gs-bucket', 'gs://chromium-layout-test-archives', | 128 '--gs-bucket', 'gs://chromium-layout-test-archives', |
| 129 ] + api.json.property_args(), | 129 ] + api.json.property_args(), |
| 130 followup_fn=archive_webkit_tests_results_followup | 130 followup_fn=archive_webkit_tests_results_followup |
| 131 ) | 131 ) |
| 132 | 132 |
| 133 if not with_patch.unexpected_failures: | 133 if not with_patch.unexpected_failures: |
| 134 yield api.python.inline('webkit_tests', 'print "ALL IS WELL"') | 134 yield api.python.inline('webkit_tests', 'print "ALL IS WELL"') |
| 135 return | 135 return |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 api.test('warn_on_flakey') + | 204 api.test('warn_on_flakey') + |
| 205 api.properties.tryserver( | 205 api.properties.tryserver( |
| 206 build_config='Release', | 206 build_config='Release', |
| 207 config_name='blink', | 207 config_name='blink', |
| 208 root='src/third_party/WebKit', | 208 root='src/third_party/WebKit', |
| 209 GIT_MODE=False, | 209 GIT_MODE=False, |
| 210 ) + | 210 ) + |
| 211 api.step_data(with_patch, canned_test(False)) + | 211 api.step_data(with_patch, canned_test(False)) + |
| 212 api.step_data(without_patch, canned_test(True)) | 212 api.step_data(without_patch, canned_test(True)) |
| 213 ) | 213 ) |
| OLD | NEW |