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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: buildbot/master/master_builders_cfg.py

Issue 23001003: Remove base-* directories from gm expected/actual paths; just use platform names (Closed) Base URL: http://skia.googlecode.com/svn/
Patch Set: buildbot_slave Created 7 years, 4 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
« no previous file with comments | « no previous file | buildbot/master/master_private_builders_cfg.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 # Sets up all the builders we want this buildbot master to run. 5 # Sets up all the builders we want this buildbot master to run.
6 6
7 #pylint: disable=C0301 7 #pylint: disable=C0301
8 8
9 from skia_master_scripts import android_factory 9 from skia_master_scripts import android_factory
10 from skia_master_scripts import canary_factory 10 from skia_master_scripts import canary_factory
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 no_gpu = repr({'skia_gpu': '0'}) 120 no_gpu = repr({'skia_gpu': '0'})
121 valgrind = repr({'skia_release_optimization_level': '1'}) 121 valgrind = repr({'skia_release_optimization_level': '1'})
122 122
123 # builder_specs is a dictionary whose keys are specifications for compile 123 # builder_specs is a dictionary whose keys are specifications for compile
124 # builders and values are specifications for Test and Perf builders which will 124 # builders and values are specifications for Test and Perf builders which will
125 # eventually *depend* on those compile builders. 125 # eventually *depend* on those compile builders.
126 builder_specs = {} 126 builder_specs = {}
127 # 127 #
128 # COMPILE BUILDERS TEST AND PERF BUILDERS 128 # COMPILE BUILDERS TEST AND PERF BUILDERS
129 # 129 #
130 # OS Compiler Config Arch Extra Config GYP_DEFS WERR Role OS Model GPU Extra Config GM Subdir 130 # OS Compiler Config Arch Extra Config GYP_DEFS WERR Role OS Model GPU Extra Config
131 # 131 #
132 f = skia_factory.SkiaFactory 132 f = skia_factory.SkiaFactory
133 p = skia_factory.TARGET_PLATFORM_LINUX 133 p = skia_factory.TARGET_PLATFORM_LINUX
134 builder_specs.update({ 134 builder_specs.update({
135 ('Ubuntu12', 'GCC', 'Debug', 'x86', None, None, True , f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'ATI5770', None, 'ba se-shuttle_ubuntu12_ati5770')], 135 ('Ubuntu12', 'GCC', 'Debug', 'x86', None, None, True , f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'ATI5770', None)],
136 ('Ubuntu12', 'GCC', 'Release', 'x86', None, None, True , f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'ATI5770', None, 'ba se-shuttle_ubuntu12_ati5770'), 136 ('Ubuntu12', 'GCC', 'Release', 'x86', None, None, True , f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'ATI5770', None),
137 ('Perf', 'Ubuntu12', 'ShuttleA', 'ATI5770', None, Non e)], 137 ('Perf', 'Ubuntu12', 'ShuttleA', 'ATI5770', None)],
138 ('Ubuntu12', 'GCC', 'Debug', 'x86_64', None, None, True , f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'ATI5770', None, 'ba se-shuttle_ubuntu12_ati5770')], 138 ('Ubuntu12', 'GCC', 'Debug', 'x86_64', None, None, True , f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'ATI5770', None)],
139 ('Ubuntu12', 'GCC', 'Release', 'x86_64', None, None, True , f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'ATI5770', None, 'ba se-shuttle_ubuntu12_ati5770'), 139 ('Ubuntu12', 'GCC', 'Release', 'x86_64', None, None, True , f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'ATI5770', None),
140 ('Perf', 'Ubuntu12', 'ShuttleA', 'ATI5770', None, Non e)], 140 ('Perf', 'Ubuntu12', 'ShuttleA', 'ATI5770', None)],
141 ('Ubuntu12', 'GCC', 'Release', 'x86_64', 'Valgrind', valgrind, Fals e, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'HD2000', 'Valgrind', Non e)], 141 ('Ubuntu12', 'GCC', 'Release', 'x86_64', 'Valgrind', valgrind, Fals e, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'HD2000', 'Valgrind')],
142 ('Ubuntu12', 'Clang', 'Debug', 'x86_64', 'ASAN', None, Fals e, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'HD2000', 'ASAN', Non e)], 142 ('Ubuntu12', 'Clang', 'Debug', 'x86_64', 'ASAN', None, Fals e, f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'HD2000', 'ASAN')],
143 ('Ubuntu12', 'GCC', 'Debug', 'x86_64', 'NoGPU', no_gpu, True , f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'NoGPU', None, 'ba se-shuttle_ubuntu12_ati5770')], 143 ('Ubuntu12', 'GCC', 'Debug', 'x86_64', 'NoGPU', no_gpu, True , f, p) : [('Test', 'Ubuntu12', 'ShuttleA', 'NoGPU', None)],
144 ('Ubuntu12', 'GCC', 'Release', 'x86_64', 'NoGPU', no_gpu, True , f, p) : [], 144 ('Ubuntu12', 'GCC', 'Release', 'x86_64', 'NoGPU', no_gpu, True , f, p) : [],
145 ('Ubuntu12', 'Clang', 'Debug', 'x86_64', None, None, True , f, p) : [],}) 145 ('Ubuntu12', 'Clang', 'Debug', 'x86_64', None, None, True , f, p) : [],})
146 f = nacl_factory.NaClFactory 146 f = nacl_factory.NaClFactory
147 builder_specs.update({ 147 builder_specs.update({
148 ('Ubuntu12', 'GCC', 'Debug', 'NaCl', None, None, True , f, p) : [], 148 ('Ubuntu12', 'GCC', 'Debug', 'NaCl', None, None, True , f, p) : [],
149 ('Ubuntu12', 'GCC', 'Release', 'NaCl', None, None, True , f, p) : [],}) 149 ('Ubuntu12', 'GCC', 'Release', 'NaCl', None, None, True , f, p) : [],})
150 f = skia_factory.SkiaFactory 150 f = skia_factory.SkiaFactory
151 p = skia_factory.TARGET_PLATFORM_MAC 151 p = skia_factory.TARGET_PLATFORM_MAC
152 builder_specs.update({ 152 builder_specs.update({
153 ('Mac10.6', 'GCC', 'Debug', 'x86', None, gyp_10_6, True , f, p) : [('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None, 'ba se-macmini')], 153 ('Mac10.6', 'GCC', 'Debug', 'x86', None, gyp_10_6, True , f, p) : [('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None)],
154 ('Mac10.6', 'GCC', 'Release', 'x86', None, gyp_10_6, True , f, p) : [('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None, 'ba se-macmini'), 154 ('Mac10.6', 'GCC', 'Release', 'x86', None, gyp_10_6, True , f, p) : [('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None),
155 ('Perf', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None, Non e)], 155 ('Perf', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None)],
156 ('Mac10.6', 'GCC', 'Debug', 'x86_64', None, gyp_10_6, Fals e, f, p) : [('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None, 'ba se-macmini')], 156 ('Mac10.6', 'GCC', 'Debug', 'x86_64', None, gyp_10_6, Fals e, f, p) : [('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None)],
157 ('Mac10.6', 'GCC', 'Release', 'x86_64', None, gyp_10_6, Fals e, f, p) : [('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None, 'ba se-macmini'), 157 ('Mac10.6', 'GCC', 'Release', 'x86_64', None, gyp_10_6, Fals e, f, p) : [('Test', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None),
158 ('Perf', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None, Non e)], 158 ('Perf', 'Mac10.6', 'MacMini4.1', 'GeForce320M', None)],
159 ('Mac10.7', 'Clang', 'Debug', 'x86', None, None, True , f, p) : [('Test', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None, 'ba se-macmini-lion-float')], 159 ('Mac10.7', 'Clang', 'Debug', 'x86', None, None, True , f, p) : [('Test', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None)],
160 ('Mac10.7', 'Clang', 'Release', 'x86', None, None, True , f, p) : [('Test', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None, 'ba se-macmini-lion-float'), 160 ('Mac10.7', 'Clang', 'Release', 'x86', None, None, True , f, p) : [('Test', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None),
161 ('Perf', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None, Non e)], 161 ('Perf', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None)],
162 ('Mac10.7', 'Clang', 'Debug', 'x86_64', None, None, Fals e, f, p) : [('Test', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None, 'ba se-macmini-lion-float')], 162 ('Mac10.7', 'Clang', 'Debug', 'x86_64', None, None, Fals e, f, p) : [('Test', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None)],
163 ('Mac10.7', 'Clang', 'Release', 'x86_64', None, None, Fals e, f, p) : [('Test', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None, 'ba se-macmini-lion-float'), 163 ('Mac10.7', 'Clang', 'Release', 'x86_64', None, None, Fals e, f, p) : [('Test', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None),
164 ('Perf', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None, Non e)], 164 ('Perf', 'Mac10.7', 'MacMini4.1', 'GeForce320M', None)],
165 ('Mac10.8', 'Clang', 'Debug', 'x86', None, None, True , f, p) : [('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None, 'ba se-macmini-10_8')], 165 ('Mac10.8', 'Clang', 'Debug', 'x86', None, None, True , f, p) : [('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None)],
166 ('Mac10.8', 'Clang', 'Release', 'x86', None, None, True , f, p) : [('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None, 'ba se-macmini-10_8'), 166 ('Mac10.8', 'Clang', 'Release', 'x86', None, None, True , f, p) : [('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None),
167 ('Perf', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None, Non e)], 167 ('Perf', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None)],
168 ('Mac10.8', 'Clang', 'Debug', 'x86_64', None, None, Fals e, f, p) : [('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None, 'ba se-macmini-10_8')], 168 ('Mac10.8', 'Clang', 'Debug', 'x86_64', None, None, Fals e, f, p) : [('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None)],
169 ('Mac10.8', 'Clang', 'Release', 'x86_64', None, None, Fals e, f, p) : [('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None, 'ba se-macmini-10_8'), 169 ('Mac10.8', 'Clang', 'Release', 'x86_64', None, None, Fals e, f, p) : [('Test', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None),
170 ('Perf', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None, Non e)],}) 170 ('Perf', 'Mac10.8', 'MacMini4.1', 'GeForce320M', None)],})
171 p = skia_factory.TARGET_PLATFORM_WIN32 171 p = skia_factory.TARGET_PLATFORM_WIN32
172 builder_specs.update({ 172 builder_specs.update({
173 ('Win7', 'VS2010', 'Debug', 'x86', None, gyp_win, True , f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', None, 'ba se-shuttle-win7-intel-float')], 173 ('Win7', 'VS2010', 'Debug', 'x86', None, gyp_win, True , f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', None)],
174 ('Win7', 'VS2010', 'Release', 'x86', None, gyp_win, True , f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', None, 'ba se-shuttle-win7-intel-float'), 174 ('Win7', 'VS2010', 'Release', 'x86', None, gyp_win, True , f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', None),
175 ('Perf', 'Win7', 'ShuttleA', 'HD2000', None, Non e)], 175 ('Perf', 'Win7', 'ShuttleA', 'HD2000', None)],
176 ('Win7', 'VS2010', 'Debug', 'x86_64', None, gyp_win, Fals e, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', None, 'ba se-shuttle-win7-intel-float')], 176 ('Win7', 'VS2010', 'Debug', 'x86_64', None, gyp_win, Fals e, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', None)],
177 ('Win7', 'VS2010', 'Release', 'x86_64', None, gyp_win, Fals e, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', None, 'ba se-shuttle-win7-intel-float'), 177 ('Win7', 'VS2010', 'Release', 'x86_64', None, gyp_win, Fals e, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', None),
178 ('Perf', 'Win7', 'ShuttleA', 'HD2000', None, Non e)], 178 ('Perf', 'Win7', 'ShuttleA', 'HD2000', None)],
179 ('Win7', 'VS2010', 'Debug', 'x86', 'ANGLE', gyp_angle, True , f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', 'ANGLE', 'ba se-shuttle-win7-intel-angle')], 179 ('Win7', 'VS2010', 'Debug', 'x86', 'ANGLE', gyp_angle, True , f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', 'ANGLE')],
180 ('Win7', 'VS2010', 'Release', 'x86', 'ANGLE', gyp_angle, True , f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', 'ANGLE', 'ba se-shuttle-win7-intel-angle'), 180 ('Win7', 'VS2010', 'Release', 'x86', 'ANGLE', gyp_angle, True , f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', 'ANGLE'),
181 ('Perf', 'Win7', 'ShuttleA', 'HD2000', 'ANGLE', Non e)], 181 ('Perf', 'Win7', 'ShuttleA', 'HD2000', 'ANGLE')],
182 ('Win7', 'VS2010', 'Debug', 'x86', 'DirectWrite', gyp_dw, Fals e, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', 'DirectWrite', 'ba se-shuttle-win7-intel-directwrite')], 182 ('Win7', 'VS2010', 'Debug', 'x86', 'DirectWrite', gyp_dw, Fals e, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', 'DirectWrite')],
183 ('Win7', 'VS2010', 'Release', 'x86', 'DirectWrite', gyp_dw, Fals e, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', 'DirectWrite', 'ba se-shuttle-win7-intel-directwrite'), 183 ('Win7', 'VS2010', 'Release', 'x86', 'DirectWrite', gyp_dw, Fals e, f, p) : [('Test', 'Win7', 'ShuttleA', 'HD2000', 'DirectWrite'),
184 ('Perf', 'Win7', 'ShuttleA', 'HD2000', 'DirectWrite', Non e)], 184 ('Perf', 'Win7', 'ShuttleA', 'HD2000', 'DirectWrite')],
185 ('Win7', 'VS2010', 'Debug', 'x86', 'Exceptions', gyp_exc, Fals e, f, p) : [], 185 ('Win7', 'VS2010', 'Debug', 'x86', 'Exceptions', gyp_exc, Fals e, f, p) : [],
186 ('Win8', 'VS2012', 'Debug', 'x86', None, gyp_win, True , f, p) : [], 186 ('Win8', 'VS2012', 'Debug', 'x86', None, gyp_win, True , f, p) : [],
187 ('Win8', 'VS2012', 'Release', 'x86', None, gyp_win, True , f, p) : [], 187 ('Win8', 'VS2012', 'Release', 'x86', None, gyp_win, True , f, p) : [],
188 ('Win8', 'VS2012', 'Debug', 'x86_64', None, gyp_win, Fals e, f, p) : [], 188 ('Win8', 'VS2012', 'Debug', 'x86_64', None, gyp_win, Fals e, f, p) : [],
189 ('Win8', 'VS2012', 'Release', 'x86_64', None, gyp_win, Fals e, f, p) : []}) 189 ('Win8', 'VS2012', 'Release', 'x86_64', None, gyp_win, Fals e, f, p) : []})
190 f = android_factory.AndroidFactory 190 f = android_factory.AndroidFactory
191 p = skia_factory.TARGET_PLATFORM_LINUX 191 p = skia_factory.TARGET_PLATFORM_LINUX
192 builder_specs.update({ 192 builder_specs.update({
193 ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'NexusS', None, True , f, p) : [('Test', 'Android', 'NexusS', 'SGX540', None, 'ba se-android-nexus-s')], 193 ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'NexusS', None, True , f, p) : [('Test', 'Android', 'NexusS', 'SGX540', None)],
194 ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'NexusS', None, True , f, p) : [('Test', 'Android', 'NexusS', 'SGX540', None, 'ba se-android-nexus-s'), 194 ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'NexusS', None, True , f, p) : [('Test', 'Android', 'NexusS', 'SGX540', None),
195 ('Perf', 'Android', 'NexusS', 'SGX540', None, Non e)], 195 ('Perf', 'Android', 'NexusS', 'SGX540', None)],
196 ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Nexus4', None, True , f, p) : [('Test', 'Android', 'Nexus4', 'Adreno320', None, 'ba se-android-nexus-4')], 196 ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Nexus4', None, True , f, p) : [('Test', 'Android', 'Nexus4', 'Adreno320', None)],
197 ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Nexus4', None, True , f, p) : [('Test', 'Android', 'Nexus4', 'Adreno320', None, 'ba se-android-nexus-4'), 197 ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Nexus4', None, True , f, p) : [('Test', 'Android', 'Nexus4', 'Adreno320', None),
198 ('Perf', 'Android', 'Nexus4', 'Adreno320', None, Non e)], 198 ('Perf', 'Android', 'Nexus4', 'Adreno320', None)],
199 ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Nexus7', None, True , f, p) : [('Test', 'Android', 'Nexus7', 'Tegra3', None, 'ba se-android-nexus-7')], 199 ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Nexus7', None, True , f, p) : [('Test', 'Android', 'Nexus7', 'Tegra3', None)],
200 ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Nexus7', None, True , f, p) : [('Test', 'Android', 'Nexus7', 'Tegra3', None, 'ba se-android-nexus-7'), 200 ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Nexus7', None, True , f, p) : [('Test', 'Android', 'Nexus7', 'Tegra3', None),
201 ('Perf', 'Android', 'Nexus7', 'Tegra3', None, Non e)], 201 ('Perf', 'Android', 'Nexus7', 'Tegra3', None)],
202 ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Nexus10', None, True , f, p) : [('Test', 'Android', 'Nexus10', 'MaliT604', None, 'ba se-android-nexus-10')], 202 ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Nexus10', None, True , f, p) : [('Test', 'Android', 'Nexus10', 'MaliT604', None)],
203 ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Nexus10', None, True , f, p) : [('Test', 'Android', 'Nexus10', 'MaliT604', None, 'ba se-android-nexus-10'), 203 ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Nexus10', None, True , f, p) : [('Test', 'Android', 'Nexus10', 'MaliT604', None),
204 ('Perf', 'Android', 'Nexus10', 'MaliT604', None, Non e)], 204 ('Perf', 'Android', 'Nexus10', 'MaliT604', None)],
205 ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'GalaxyNexus', None, True , f, p) : [('Test', 'Android', 'GalaxyNexus','SGX540', None, 'ba se-android-galaxy-nexus')], 205 ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'GalaxyNexus', None, True , f, p) : [('Test', 'Android', 'GalaxyNexus','SGX540', None)],
206 ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'GalaxyNexus', None, True , f, p) : [('Test', 'Android', 'GalaxyNexus','SGX540', None, 'ba se-android-galaxy-nexus'), 206 ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'GalaxyNexus', None, True , f, p) : [('Test', 'Android', 'GalaxyNexus','SGX540', None),
207 ('Perf', 'Android', 'GalaxyNexus','SGX540', None, Non e)], 207 ('Perf', 'Android', 'GalaxyNexus','SGX540', None)],
208 ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Xoom', None, True , f, p) : [('Test', 'Android', 'Xoom', 'Tegra2', None, 'ba se-android-xoom')], 208 ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Xoom', None, True , f, p) : [('Test', 'Android', 'Xoom', 'Tegra2', None)],
209 ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Xoom', None, True , f, p) : [('Test', 'Android', 'Xoom', 'Tegra2', None, 'ba se-android-xoom'), 209 ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Xoom', None, True , f, p) : [('Test', 'Android', 'Xoom', 'Tegra2', None),
210 ('Perf', 'Android', 'Xoom', 'Tegra2', None, Non e)], 210 ('Perf', 'Android', 'Xoom', 'Tegra2', None)],
211 ('Ubuntu12', 'GCC', 'Debug', 'x86', 'RazrI', None, True , f, p) : [('Test', 'Android', 'RazrI', 'SGX540', None, 'ba se-android-razr-i')], 211 ('Ubuntu12', 'GCC', 'Debug', 'x86', 'RazrI', None, True , f, p) : [('Test', 'Android', 'RazrI', 'SGX540', None)],
212 ('Ubuntu12', 'GCC', 'Release', 'x86', 'RazrI', None, True , f, p) : [('Test', 'Android', 'RazrI', 'SGX540', None, 'ba se-android-razr-i'), 212 ('Ubuntu12', 'GCC', 'Release', 'x86', 'RazrI', None, True , f, p) : [('Test', 'Android', 'RazrI', 'SGX540', None),
213 ('Perf', 'Android', 'RazrI', 'SGX540', None, Non e)],}) 213 ('Perf', 'Android', 'RazrI', 'SGX540', None)],})
214 f = chromeos_factory.ChromeOSFactory 214 f = chromeos_factory.ChromeOSFactory
215 builder_specs.update({ 215 builder_specs.update({
216 ('Ubuntu12', 'GCC', 'Debug', 'x86', 'Alex', None, True , f, p) : [('Test', 'ChromeOS', 'Alex', 'GMA3150', None, Non e)], 216 ('Ubuntu12', 'GCC', 'Debug', 'x86', 'Alex', None, True , f, p) : [('Test', 'ChromeOS', 'Alex', 'GMA3150', None)],
217 ('Ubuntu12', 'GCC', 'Release', 'x86', 'Alex', None, True , f, p) : [('Test', 'ChromeOS', 'Alex', 'GMA3150', None, Non e), 217 ('Ubuntu12', 'GCC', 'Release', 'x86', 'Alex', None, True , f, p) : [('Test', 'ChromeOS', 'Alex', 'GMA3150', None),
218 ('Perf', 'ChromeOS', 'Alex', 'GMA3150', None, Non e)], 218 ('Perf', 'ChromeOS', 'Alex', 'GMA3150', None)],
219 ('Ubuntu12', 'GCC', 'Debug', 'x86_64', 'Link', None, True , f, p) : [('Test', 'ChromeOS', 'Link', 'HD4000', None, Non e)], 219 ('Ubuntu12', 'GCC', 'Debug', 'x86_64', 'Link', None, True , f, p) : [('Test', 'ChromeOS', 'Link', 'HD4000', None)],
220 ('Ubuntu12', 'GCC', 'Release', 'x86_64', 'Link', None, True , f, p) : [('Test', 'ChromeOS', 'Link', 'HD4000', None, Non e), 220 ('Ubuntu12', 'GCC', 'Release', 'x86_64', 'Link', None, True , f, p) : [('Test', 'ChromeOS', 'Link', 'HD4000', None),
221 ('Perf', 'ChromeOS', 'Link', 'HD4000', None, Non e)], 221 ('Perf', 'ChromeOS', 'Link', 'HD4000', None)],
222 ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Daisy', None, True , f, p) : [('Test', 'ChromeOS', 'Daisy', 'MaliT604', None, Non e)], 222 ('Ubuntu12', 'GCC', 'Debug', 'Arm7', 'Daisy', None, True , f, p) : [('Test', 'ChromeOS', 'Daisy', 'MaliT604', None)],
223 ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Daisy', None, True , f, p) : [('Test', 'ChromeOS', 'Daisy', 'MaliT604', None, Non e), 223 ('Ubuntu12', 'GCC', 'Release', 'Arm7', 'Daisy', None, True , f, p) : [('Test', 'ChromeOS', 'Daisy', 'MaliT604', None),
224 ('Perf', 'ChromeOS', 'Daisy', 'MaliT604', None, Non e)],}) 224 ('Perf', 'ChromeOS', 'Daisy', 'MaliT604', None)],})
225 f = ios_factory.iOSFactory 225 f = ios_factory.iOSFactory
226 p = skia_factory.TARGET_PLATFORM_MAC 226 p = skia_factory.TARGET_PLATFORM_MAC
227 builder_specs.update({ 227 builder_specs.update({
228 ('Mac10.7', 'Clang', 'Debug', 'Arm7', 'iOS', gyp_ios, True , f, p) : [], 228 ('Mac10.7', 'Clang', 'Debug', 'Arm7', 'iOS', gyp_ios, True , f, p) : [],
229 ('Mac10.7', 'Clang', 'Release', 'Arm7', 'iOS', gyp_ios, True , f, p) : [],}) 229 ('Mac10.7', 'Clang', 'Release', 'Arm7', 'iOS', gyp_ios, True , f, p) : [],})
230 230
231 for compile_builder in sorted(builder_specs.keys()): 231 for compile_builder in sorted(builder_specs.keys()):
232 factory_type = compile_builder[7] 232 factory_type = compile_builder[7]
233 factory_args = GetExtraFactoryArgs(compile_builder) 233 factory_args = GetExtraFactoryArgs(compile_builder)
234 target_platform = compile_builder[8] 234 target_platform = compile_builder[8]
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 role=role, 274 role=role,
275 os=dependent_builder[1], 275 os=dependent_builder[1],
276 model=dependent_builder[2], 276 model=dependent_builder[2],
277 gpu=dependent_builder[3], 277 gpu=dependent_builder[3],
278 extra_config=dependent_builder[4], 278 extra_config=dependent_builder[4],
279 configuration=compile_builder[2], 279 configuration=compile_builder[2],
280 arch=compile_builder[3], 280 arch=compile_builder[3],
281 gyp_defines=gyp_defines, 281 gyp_defines=gyp_defines,
282 factory_type=factory_type, 282 factory_type=factory_type,
283 target_platform=target_platform, 283 target_platform=target_platform,
284 gm_image_subdir=dependent_builder[5],
285 do_upload_results=do_upload_results, 284 do_upload_results=do_upload_results,
286 perf_output_basedir=perf_output_basedir, 285 perf_output_basedir=perf_output_basedir,
287 compile_warnings_as_errors=False, 286 compile_warnings_as_errors=False,
288 **factory_args) 287 **factory_args)
289 288
290 # TODO(borenet): Specify the Housekeeping and Canary builders in a nice table 289 # TODO(borenet): Specify the Housekeeping and Canary builders in a nice table
291 # as above. 290 # as above.
292 # House Keeping 291 # House Keeping
293 housekeepers = [ 292 housekeepers = [
294 # The Percommit housekeeper 293 # The Percommit housekeeper
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 helper.Factory('f_%s' % builder_name, 371 helper.Factory('f_%s' % builder_name,
373 factory( 372 factory(
374 do_upload_results=do_upload_results, 373 do_upload_results=do_upload_results,
375 target_platform=target_platform, 374 target_platform=target_platform,
376 builder_name=builder_name, 375 builder_name=builder_name,
377 do_patch_step=(scheduler == utils.TRY_SCHEDULERS_STR), 376 do_patch_step=(scheduler == utils.TRY_SCHEDULERS_STR),
378 **factory_args 377 **factory_args
379 ).Build()) 378 ).Build())
380 379
381 return helper.Update(cfg) 380 return helper.Update(cfg)
OLDNEW
« no previous file with comments | « no previous file | buildbot/master/master_private_builders_cfg.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698