OLD | NEW |
---|---|
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 from master import master_config | 5 from master import master_config |
6 from master.factory import chromium_factory | 6 from master.factory import chromium_factory |
7 | 7 |
8 defaults = {} | 8 defaults = {} |
9 | 9 |
10 helper = master_config.Helper(defaults) | 10 helper = master_config.Helper(defaults) |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
66 factory_properties={'trigger': 'linux_rel_trigger'})) | 66 factory_properties={'trigger': 'linux_rel_trigger'})) |
67 | 67 |
68 # | 68 # |
69 # Linux Rel testers | 69 # Linux Rel testers |
70 # | 70 # |
71 B('Linux Tests x64', 'rel_unit', 'testers', 'linux_rel_trigger', | 71 B('Linux Tests x64', 'rel_unit', 'testers', 'linux_rel_trigger', |
72 auto_reboot=True, notify_on_missing=True) | 72 auto_reboot=True, notify_on_missing=True) |
73 F('rel_unit', linux().ChromiumFactory( | 73 F('rel_unit', linux().ChromiumFactory( |
74 slave_type='NASTester', | 74 slave_type='NASTester', |
75 tests=['check_deps', | 75 tests=['check_deps', |
76 'check_licenses', | |
76 'googleurl', | 77 'googleurl', |
77 'media', | 78 'media', |
78 'printing', | 79 'printing', |
79 'remoting', | 80 'remoting', |
80 'ui', | 81 'ui', |
81 'browser_tests', | 82 'browser_tests', |
82 'unit', | 83 'unit', |
83 'gpu', | 84 'gpu', |
84 'base', | 85 'base', |
85 'net', | 86 'net', |
(...skipping 16 matching lines...) Expand all Loading... | |
102 ] | 103 ] |
103 | 104 |
104 B('Linux Touch', 'rel_touch', 'compile', 'linux_rel', notify_on_missing=True) | 105 B('Linux Touch', 'rel_touch', 'compile', 'linux_rel', notify_on_missing=True) |
105 F('rel_touch', linux().ChromiumFactory( | 106 F('rel_touch', linux().ChromiumFactory( |
106 slave_type='BuilderTester', | 107 slave_type='BuilderTester', |
107 options=['--compiler=goma',] + linux_touch_test_targets, | 108 options=['--compiler=goma',] + linux_touch_test_targets, |
108 tests=['webkit_unit', | 109 tests=['webkit_unit', |
109 'views', | 110 'views', |
110 'sizes', ] + | 111 'sizes', ] + |
111 ['check_deps', | 112 ['check_deps', |
113 'check_licenses', | |
nsylvain
2011/09/15 16:54:49
I'd personally remove both check_deps and check_li
Paweł Hajdan Jr.
2011/09/15 17:21:06
Removed check_licenses then.
| |
112 'googleurl', | 114 'googleurl', |
113 'media', | 115 'media', |
114 'printing', | 116 'printing', |
115 'remoting', | 117 'remoting', |
116 #'ui', | 118 #'ui', |
117 #'browser_tests', | 119 #'browser_tests', |
118 'unit', | 120 'unit', |
119 'gpu', | 121 'gpu', |
120 'base', | 122 'base', |
121 #'net', | 123 #'net', |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
156 | 158 |
157 # | 159 # |
158 # Linux Dbg Unit testers | 160 # Linux Dbg Unit testers |
159 # | 161 # |
160 | 162 |
161 B('Linux Tests (dbg)(1)', 'dbg_unit_1', 'testers', 'linux_dbg_trigger', | 163 B('Linux Tests (dbg)(1)', 'dbg_unit_1', 'testers', 'linux_dbg_trigger', |
162 auto_reboot=True, notify_on_missing=True) | 164 auto_reboot=True, notify_on_missing=True) |
163 F('dbg_unit_1', linux().ChromiumFactory( | 165 F('dbg_unit_1', linux().ChromiumFactory( |
164 slave_type='NASTester', | 166 slave_type='NASTester', |
165 target='Debug', | 167 target='Debug', |
166 tests=['check_deps', 'net', 'browser_tests'], | 168 tests=['check_deps', 'check_licenses', 'net', 'browser_tests'], |
167 factory_properties={'generate_gtest_json': True})) | 169 factory_properties={'generate_gtest_json': True})) |
168 | 170 |
169 B('Linux Tests (dbg)(2)', 'dbg_unit_2', 'testers', 'linux_dbg_trigger', | 171 B('Linux Tests (dbg)(2)', 'dbg_unit_2', 'testers', 'linux_dbg_trigger', |
170 auto_reboot=True, notify_on_missing=True) | 172 auto_reboot=True, notify_on_missing=True) |
171 F('dbg_unit_2', linux().ChromiumFactory( | 173 F('dbg_unit_2', linux().ChromiumFactory( |
172 slave_type='NASTester', | 174 slave_type='NASTester', |
173 target='Debug', | 175 target='Debug', |
174 tests=['unit', | 176 tests=['unit', |
175 'nacl_integration', | 177 'nacl_integration', |
176 'gpu', | 178 'gpu', |
(...skipping 29 matching lines...) Expand all Loading... | |
206 # | 208 # |
207 | 209 |
208 B('Linux Tests (dbg)(shared)', 'dbg_shared_unit', 'testers', | 210 B('Linux Tests (dbg)(shared)', 'dbg_shared_unit', 'testers', |
209 'linux_dbg_shared_trigger', auto_reboot=True, notify_on_missing=True) | 211 'linux_dbg_shared_trigger', auto_reboot=True, notify_on_missing=True) |
210 F('dbg_shared_unit', linux().ChromiumFactory( | 212 F('dbg_shared_unit', linux().ChromiumFactory( |
211 target='Debug', | 213 target='Debug', |
212 slave_type='NASTester', | 214 slave_type='NASTester', |
213 tests=['base', | 215 tests=['base', |
214 'browser_tests', | 216 'browser_tests', |
215 'check_deps', | 217 'check_deps', |
218 'check_licenses', | |
nsylvain
2011/09/15 16:54:49
I dont think we need it here.
Paweł Hajdan Jr.
2011/09/15 17:21:06
Done.
| |
216 'media', | 219 'media', |
217 'net', 'printing', | 220 'net', 'printing', |
218 'remoting', | 221 'remoting', |
219 'sizes', | 222 'sizes', |
220 'test_shell', | 223 'test_shell', |
221 'ui', | 224 'ui', |
222 'unit', 'crypto', | 225 'unit', 'crypto', |
223 'cacheinvalidation', | 226 'cacheinvalidation', |
224 'jingle'], | 227 'jingle'], |
225 factory_properties={'generate_gtest_json': True})) | 228 factory_properties={'generate_gtest_json': True})) |
226 | 229 |
227 # | 230 # |
228 # Linux Dbg Clang bot | 231 # Linux Dbg Clang bot |
229 # | 232 # |
230 | 233 |
231 B('Linux Clang (dbg)', 'dbg_linux_clang', 'compile', 'linux_dbg', | 234 B('Linux Clang (dbg)', 'dbg_linux_clang', 'compile', 'linux_dbg', |
232 notify_on_missing=True) | 235 notify_on_missing=True) |
233 F('dbg_linux_clang', linux().ChromiumFactory( | 236 F('dbg_linux_clang', linux().ChromiumFactory( |
234 target='Debug', | 237 target='Debug', |
235 options=['--build-tool=make', '--compiler=clang'], | 238 options=['--build-tool=make', '--compiler=clang'], |
236 tests=['base', 'gfx', 'unit', 'crypto'], | 239 tests=['base', 'gfx', 'unit', 'crypto'], |
237 factory_properties={ | 240 factory_properties={ |
238 'gclient_env': { | 241 'gclient_env': { |
239 'GYP_DEFINES':'clang=1 clang_use_chrome_plugins=1 fastbuild=1' | 242 'GYP_DEFINES':'clang=1 clang_use_chrome_plugins=1 fastbuild=1' |
240 }})) | 243 }})) |
241 | 244 |
242 | 245 |
243 def Update(config, active_master, c): | 246 def Update(config, active_master, c): |
244 return helper.Update(c) | 247 return helper.Update(c) |
OLD | NEW |