Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(489)

Side by Side Diff: scripts/slave/recipe_modules/chromium_tests/chromium_webkit.py

Issue 1862773003: Remove references to crash_service, which is no longer needed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: update expectations Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 import copy 5 import copy
6 6
7 from . import chromium_chromiumos 7 from . import chromium_chromiumos
8 from . import steps 8 from . import steps
9 9
10 SPEC = copy.deepcopy(chromium_chromiumos.SPEC) 10 SPEC = copy.deepcopy(chromium_chromiumos.SPEC)
11 for b in SPEC['builders'].itervalues(): 11 for b in SPEC['builders'].itervalues():
12 b['gclient_apply_config'] = ['blink'] 12 b['gclient_apply_config'] = ['blink']
13 13
14 SPEC['settings']['build_gs_bucket'] = 'chromium-webkit-archive' 14 SPEC['settings']['build_gs_bucket'] = 'chromium-webkit-archive'
15 SPEC['settings']['src_side_runtest_py'] = False 15 SPEC['settings']['src_side_runtest_py'] = False
16 16
17 SPEC['builders'].update({ 17 SPEC['builders'].update({
18 'WebKit Win Builder': { 18 'WebKit Win Builder': {
19 'chromium_config': 'chromium', 19 'chromium_config': 'chromium',
20 'chromium_apply_config': ['mb'], 20 'chromium_apply_config': ['mb'],
21 'gclient_config': 'chromium', 21 'gclient_config': 'chromium',
22 'gclient_apply_config': ['blink_or_chromium'], 22 'gclient_apply_config': ['blink_or_chromium'],
23 'chromium_config_kwargs': { 23 'chromium_config_kwargs': {
24 'BUILD_CONFIG': 'Release', 24 'BUILD_CONFIG': 'Release',
25 'TARGET_BITS': 32, 25 'TARGET_BITS': 32,
26 }, 26 },
27 'compile_targets': [
28 # TODO(phajdan.jr): Find a way to automatically add crash_service
29 # to Windows builds (so that start_crash_service step works).
30 'crash_service',
31 ],
32 'bot_type': 'builder', 27 'bot_type': 'builder',
33 'testing': { 28 'testing': {
34 'platform': 'win', 29 'platform': 'win',
35 }, 30 },
36 'enable_swarming': True, 31 'enable_swarming': True,
37 'use_isolate': True, 32 'use_isolate': True,
38 }, 33 },
39 'WebKit Win7': { 34 'WebKit Win7': {
40 'chromium_config': 'chromium', 35 'chromium_config': 'chromium',
41 'chromium_apply_config': ['mb'], 36 'chromium_apply_config': ['mb'],
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 'chromium_apply_config': ['mb'], 84 'chromium_apply_config': ['mb'],
90 'gclient_config': 'chromium', 85 'gclient_config': 'chromium',
91 'gclient_apply_config': ['blink_or_chromium'], 86 'gclient_apply_config': ['blink_or_chromium'],
92 'chromium_config_kwargs': { 87 'chromium_config_kwargs': {
93 'BUILD_CONFIG': 'Release', 88 'BUILD_CONFIG': 'Release',
94 'TARGET_BITS': 64, 89 'TARGET_BITS': 64,
95 }, 90 },
96 'compile_targets': [ 91 'compile_targets': [
97 # TODO(phajdan.jr): Shouldn't be needed once we have 64-bit testers. 92 # TODO(phajdan.jr): Shouldn't be needed once we have 64-bit testers.
98 'blink_tests', 93 'blink_tests',
99
100 # TODO(phajdan.jr): Find a way to automatically add crash_service
101 # to Windows builds (so that start_crash_service step works).
102 'crash_service',
103 ], 94 ],
104 'bot_type': 'builder_tester', 95 'bot_type': 'builder_tester',
105 'test_generators': [ 96 'test_generators': [
106 steps.generate_gtest, 97 steps.generate_gtest,
107 steps.generate_script, 98 steps.generate_script,
108 ], 99 ],
109 'testing': { 100 'testing': {
110 'platform': 'win', 101 'platform': 'win',
111 }, 102 },
112 'enable_swarming': True, 103 'enable_swarming': True,
113 'use_isolate': True, 104 'use_isolate': True,
114 }, 105 },
115 'WebKit Win Builder (dbg)': { 106 'WebKit Win Builder (dbg)': {
116 'chromium_config': 'chromium', 107 'chromium_config': 'chromium',
117 'chromium_apply_config': ['mb'], 108 'chromium_apply_config': ['mb'],
118 'gclient_config': 'chromium', 109 'gclient_config': 'chromium',
119 'gclient_apply_config': ['blink_or_chromium'], 110 'gclient_apply_config': ['blink_or_chromium'],
120 'chromium_config_kwargs': { 111 'chromium_config_kwargs': {
121 'BUILD_CONFIG': 'Debug', 112 'BUILD_CONFIG': 'Debug',
122 'TARGET_BITS': 32, 113 'TARGET_BITS': 32,
123 }, 114 },
124 'compile_targets': [
125 # TODO(phajdan.jr): Find a way to automatically add crash_service
126 # to Windows builds (so that start_crash_service step works).
127 'crash_service',
128 ],
129 'bot_type': 'builder', 115 'bot_type': 'builder',
130 'testing': { 116 'testing': {
131 'platform': 'win', 117 'platform': 'win',
132 }, 118 },
133 'enable_swarming': True, 119 'enable_swarming': True,
134 'use_isolate': True, 120 'use_isolate': True,
135 }, 121 },
136 'WebKit Win7 (dbg)': { 122 'WebKit Win7 (dbg)': {
137 'chromium_config': 'chromium', 123 'chromium_config': 'chromium',
138 'chromium_apply_config': ['mb'], 124 'chromium_apply_config': ['mb'],
(...skipping 23 matching lines...) Expand all
162 'chromium_apply_config': ['mb'], 148 'chromium_apply_config': ['mb'],
163 'gclient_config': 'chromium', 149 'gclient_config': 'chromium',
164 'gclient_apply_config': ['blink_or_chromium'], 150 'gclient_apply_config': ['blink_or_chromium'],
165 'chromium_config_kwargs': { 151 'chromium_config_kwargs': {
166 'BUILD_CONFIG': 'Debug', 152 'BUILD_CONFIG': 'Debug',
167 'TARGET_BITS': 64, 153 'TARGET_BITS': 64,
168 }, 154 },
169 'compile_targets': [ 155 'compile_targets': [
170 # TODO(phajdan.jr): Shouldn't be needed once we have 64-bit testers. 156 # TODO(phajdan.jr): Shouldn't be needed once we have 64-bit testers.
171 'blink_tests', 157 'blink_tests',
172
173 # TODO(phajdan.jr): Find a way to automatically add crash_service
174 # to Windows builds (so that start_crash_service step works).
175 'crash_service',
176 ], 158 ],
177 'bot_type': 'builder_tester', 159 'bot_type': 'builder_tester',
178 'test_generators': [ 160 'test_generators': [
179 steps.generate_gtest, 161 steps.generate_gtest,
180 steps.generate_script, 162 steps.generate_script,
181 ], 163 ],
182 'testing': { 164 'testing': {
183 'platform': 'win', 165 'platform': 'win',
184 }, 166 },
185 'enable_swarming': True, 167 'enable_swarming': True,
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 'WebKit Win non-Oilpan': { 522 'WebKit Win non-Oilpan': {
541 'chromium_config': 'chromium', 523 'chromium_config': 'chromium',
542 'chromium_apply_config': ['mb'], 524 'chromium_apply_config': ['mb'],
543 'gclient_config': 'chromium', 525 'gclient_config': 'chromium',
544 'gclient_apply_config': ['blink_or_chromium'], 526 'gclient_apply_config': ['blink_or_chromium'],
545 'chromium_apply_config': ['oilpan'], 527 'chromium_apply_config': ['oilpan'],
546 'chromium_config_kwargs': { 528 'chromium_config_kwargs': {
547 'BUILD_CONFIG': 'Release', 529 'BUILD_CONFIG': 'Release',
548 'TARGET_BITS': 32, 530 'TARGET_BITS': 32,
549 }, 531 },
550 'compile_targets': [
551 # TODO(phajdan.jr): Find a way to automatically add crash_service
552 # to Windows builds (so that start_crash_service step works).
553 'crash_service',
554 ],
555 'test_generators': [ 532 'test_generators': [
556 steps.generate_gtest, 533 steps.generate_gtest,
557 steps.generate_script, 534 steps.generate_script,
558 ], 535 ],
559 'tests': [ 536 'tests': [
560 steps.BlinkTest(extra_args=[ 537 steps.BlinkTest(extra_args=[
561 '--additional-expectations', 538 '--additional-expectations',
562 'src\\third_party\\WebKit\\LayoutTests\\OilpanExpectations', 539 'src\\third_party\\WebKit\\LayoutTests\\OilpanExpectations',
563 ]), 540 ]),
564 ], 541 ],
565 'testing': { 542 'testing': {
566 'platform': 'win', 543 'platform': 'win',
567 }, 544 },
568 'enable_swarming': True, 545 'enable_swarming': True,
569 'use_isolate': True, 546 'use_isolate': True,
570 }, 547 },
571 'WebKit Win non-Oilpan (dbg)': { 548 'WebKit Win non-Oilpan (dbg)': {
572 'chromium_config': 'chromium', 549 'chromium_config': 'chromium',
573 'chromium_apply_config': ['mb', 'oilpan'], 550 'chromium_apply_config': ['mb', 'oilpan'],
574 'gclient_config': 'chromium', 551 'gclient_config': 'chromium',
575 'gclient_apply_config': ['blink_or_chromium'], 552 'gclient_apply_config': ['blink_or_chromium'],
576 'chromium_config_kwargs': { 553 'chromium_config_kwargs': {
577 'BUILD_CONFIG': 'Debug', 554 'BUILD_CONFIG': 'Debug',
578 'TARGET_BITS': 32, 555 'TARGET_BITS': 32,
579 }, 556 },
580 'compile_targets': [
581 # TODO(phajdan.jr): Find a way to automatically add crash_service
582 # to Windows builds (so that start_crash_service step works).
583 'crash_service',
584 ],
585 'test_generators': [ 557 'test_generators': [
586 steps.generate_gtest, 558 steps.generate_gtest,
587 steps.generate_script, 559 steps.generate_script,
588 ], 560 ],
589 'tests': [ 561 'tests': [
590 steps.BlinkTest(extra_args=[ 562 steps.BlinkTest(extra_args=[
591 '--additional-expectations', 563 '--additional-expectations',
592 'src\\third_party\\WebKit\\LayoutTests\\OilpanExpectations', 564 'src\\third_party\\WebKit\\LayoutTests\\OilpanExpectations',
593 ]), 565 ]),
594 ], 566 ],
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
809 'src/third_party/WebKit/LayoutTests/OilpanExpectations', 781 'src/third_party/WebKit/LayoutTests/OilpanExpectations',
810 ]), 782 ]),
811 ], 783 ],
812 'testing': { 784 'testing': {
813 'platform': 'linux', 785 'platform': 'linux',
814 }, 786 },
815 'enable_swarming': True, 787 'enable_swarming': True,
816 'use_isolate': True, 788 'use_isolate': True,
817 }, 789 },
818 }) 790 })
OLDNEW
« no previous file with comments | « scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py ('k') | scripts/slave/recipe_modules/chromium_tests/steps.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698