OLD | NEW |
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 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 27 matching lines...) Expand all Loading... |
38 'printing_unittests', | 38 'printing_unittests', |
39 'remoting_unittests', | 39 'remoting_unittests', |
40 'net_unittests', | 40 'net_unittests', |
41 'safe_browsing_tests', | 41 'safe_browsing_tests', |
42 'cacheinvalidation_unittests', | 42 'cacheinvalidation_unittests', |
43 'jingle_unittests', | 43 'jingle_unittests', |
44 'sql_unittests', # from test target unit | 44 'sql_unittests', # from test target unit |
45 'ipc_tests', # from test target unit | 45 'ipc_tests', # from test target unit |
46 'sync_unit_tests', # from test target unit | 46 'sync_unit_tests', # from test target unit |
47 'content_unittests', # from test target unit | 47 'content_unittests', # from test target unit |
| 48 'ui_unittests', # from test target unit |
48 'unit_tests', # from test target unit | 49 'unit_tests', # from test target unit |
49 'gfx_unittests', # from test target unit | |
50 'browser_tests', | 50 'browser_tests', |
51 ] | 51 ] |
52 | 52 |
53 | 53 |
54 ################################################################################ | 54 ################################################################################ |
55 ## Release | 55 ## Release |
56 ################################################################################ | 56 ################################################################################ |
57 | 57 |
58 defaults['category'] = '4linux' | 58 defaults['category'] = '4linux' |
59 | 59 |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 ] | 143 ] |
144 | 144 |
145 linux_aura_options=[ | 145 linux_aura_options=[ |
146 'aura_builder', | 146 'aura_builder', |
147 'base_unittests', | 147 'base_unittests', |
148 'browser_tests', | 148 'browser_tests', |
149 'cacheinvalidation_unittests', | 149 'cacheinvalidation_unittests', |
150 'compositor_unittests', | 150 'compositor_unittests', |
151 'content_unittests', | 151 'content_unittests', |
152 'crypto_unittests', | 152 'crypto_unittests', |
153 'gfx_unittests', | |
154 'googleurl_unittests', | 153 'googleurl_unittests', |
155 'gpu_unittests', | 154 'gpu_unittests', |
156 'interactive_ui_tests', | 155 'interactive_ui_tests', |
157 'ipc_tests', | 156 'ipc_tests', |
158 'jingle_unittests', | 157 'jingle_unittests', |
159 'net_unittests', | 158 'net_unittests', |
160 'media_unittests', | 159 'media_unittests', |
161 'printing_unittests', | 160 'printing_unittests', |
162 'remoting_unittests', | 161 'remoting_unittests', |
163 'safe_browsing_tests', | 162 'safe_browsing_tests', |
164 'sql_unittests', | 163 'sql_unittests', |
| 164 'ui_unittests', |
165 ] | 165 ] |
166 | 166 |
167 # B('Linux (aura)', 'f_linux_rel_aura', 'compile', 'linux_rel', | 167 # B('Linux (aura)', 'f_linux_rel_aura', 'compile', 'linux_rel', |
168 # notify_on_missing=True) | 168 # notify_on_missing=True) |
169 F('f_linux_rel_aura', linux().ChromiumFactory( | 169 F('f_linux_rel_aura', linux().ChromiumFactory( |
170 target='Release', | 170 target='Release', |
171 slave_type='BuilderTester', | 171 slave_type='BuilderTester', |
172 options=['--compiler=goma'] + linux_aura_options, | 172 options=['--compiler=goma'] + linux_aura_options, |
173 tests=linux_aura_tests, | 173 tests=linux_aura_tests, |
174 factory_properties={'gclient_env': {'GYP_DEFINES': 'use_aura=1'}})) | 174 factory_properties={'gclient_env': {'GYP_DEFINES': 'use_aura=1'}})) |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
265 factory_properties={ | 265 factory_properties={ |
266 'gclient_env': { | 266 'gclient_env': { |
267 'GYP_DEFINES': | 267 'GYP_DEFINES': |
268 'clang=1 clang_use_chrome_plugins=1 fastbuild=1 ' | 268 'clang=1 clang_use_chrome_plugins=1 fastbuild=1 ' |
269 'test_isolation_mode=noop', | 269 'test_isolation_mode=noop', |
270 }})) | 270 }})) |
271 | 271 |
272 | 272 |
273 def Update(config, active_master, c): | 273 def Update(config, active_master, c): |
274 return helper.Update(c) | 274 return helper.Update(c) |
OLD | NEW |