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

Side by Side Diff: masters/master.chromium/master_linux_cfg.py

Issue 10641005: Use ui_unittests instead of gfx_unittests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build/
Patch Set: Created 8 years, 6 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 (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 12 matching lines...) Expand all
23 # supervisor for long tests (more than 30 seconds) that are known to be stable. 23 # supervisor for long tests (more than 30 seconds) that are known to be stable.
24 sharded_tests = [ 24 sharded_tests = [
25 'base_unittests', 25 'base_unittests',
26 'browser_tests', 26 'browser_tests',
27 'media_unittests', 27 'media_unittests',
28 ] 28 ]
29 29
30 # These are the common targets to most of the builders 30 # These are the common targets to most of the builders
31 linux_all_test_targets = [ 31 linux_all_test_targets = [
32 'base_unittests', 32 'base_unittests',
33 'browser_tests',
34 'cacheinvalidation_unittests',
35 'content_unittests',
33 'crypto_unittests', 36 'crypto_unittests',
34 'dbus_unittests', 37 'dbus_unittests',
35 'googleurl_unittests', 38 'googleurl_unittests',
36 'gpu_unittests', 39 'gpu_unittests',
40 'ipc_tests',
41 'jingle_unittests',
37 'media_unittests', 42 'media_unittests',
43 'net_unittests',
38 'printing_unittests', 44 'printing_unittests',
39 'remoting_unittests', 45 'remoting_unittests',
40 'net_unittests',
41 'safe_browsing_tests', 46 'safe_browsing_tests',
42 'cacheinvalidation_unittests', 47 'sql_unittests',
43 'jingle_unittests', 48 'sync_unit_tests',
44 'sql_unittests', # from test target unit 49 'ui_unittests',
45 'ipc_tests', # from test target unit 50 'unit_tests',
46 'sync_unit_tests', # from test target unit
47 'content_unittests', # from test target unit
48 'unit_tests', # from test target unit
49 'gfx_unittests', # from test target unit
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
60 rel_archive = master_config.GetArchiveUrl('Chromium', 'Linux Builder x64', 60 rel_archive = master_config.GetArchiveUrl('Chromium', 'Linux Builder x64',
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 ] 142 ]
143 143
144 linux_aura_options=[ 144 linux_aura_options=[
145 'aura_builder', 145 'aura_builder',
146 'base_unittests', 146 'base_unittests',
147 'browser_tests', 147 'browser_tests',
148 'cacheinvalidation_unittests', 148 'cacheinvalidation_unittests',
149 'compositor_unittests', 149 'compositor_unittests',
150 'content_unittests', 150 'content_unittests',
151 'crypto_unittests', 151 'crypto_unittests',
152 'gfx_unittests',
153 'googleurl_unittests', 152 'googleurl_unittests',
154 'gpu_unittests', 153 'gpu_unittests',
155 'interactive_ui_tests', 154 'interactive_ui_tests',
156 'ipc_tests', 155 'ipc_tests',
157 'jingle_unittests', 156 'jingle_unittests',
157 'media_unittests',
158 'net_unittests', 158 'net_unittests',
159 'media_unittests',
160 'printing_unittests', 159 'printing_unittests',
161 'remoting_unittests', 160 'remoting_unittests',
162 'safe_browsing_tests', 161 'safe_browsing_tests',
163 'sql_unittests', 162 'sql_unittests',
163 'ui_unittests',
164 ] 164 ]
165 165
166 B('Linux (aura)', 'f_linux_rel_aura', 'compile', 'linux_rel', 166 B('Linux (aura)', 'f_linux_rel_aura', 'compile', 'linux_rel',
167 notify_on_missing=True) 167 notify_on_missing=True)
168 F('f_linux_rel_aura', linux().ChromiumFactory( 168 F('f_linux_rel_aura', linux().ChromiumFactory(
169 target='Release', 169 target='Release',
170 slave_type='BuilderTester', 170 slave_type='BuilderTester',
171 options=['--compiler=goma'] + linux_aura_options, 171 options=['--compiler=goma'] + linux_aura_options,
172 tests=linux_aura_tests, 172 tests=linux_aura_tests,
173 factory_properties={'gclient_env': {'GYP_DEFINES': 'use_aura=1'}})) 173 factory_properties={'gclient_env': {'GYP_DEFINES': 'use_aura=1'}}))
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 factory_properties={ 263 factory_properties={
264 'gclient_env': { 264 'gclient_env': {
265 'GYP_DEFINES': 265 'GYP_DEFINES':
266 'clang=1 clang_use_chrome_plugins=1 fastbuild=1 ' 266 'clang=1 clang_use_chrome_plugins=1 fastbuild=1 '
267 'test_isolation_mode=noop', 267 'test_isolation_mode=noop',
268 }})) 268 }}))
269 269
270 270
271 def Update(config, active_master, c): 271 def Update(config, active_master, c):
272 return helper.Update(c) 272 return helper.Update(c)
OLDNEW
« no previous file with comments | « masters/master.chromium.memory/master_linux_cfg.py ('k') | masters/master.tryserver.chromium/master.cfg » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698