| 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 21 matching lines...) Expand all Loading... |
| 32 # | 32 # |
| 33 T('linux_rel_trigger') | 33 T('linux_rel_trigger') |
| 34 | 34 |
| 35 # | 35 # |
| 36 # Linux Rel Builder | 36 # Linux Rel Builder |
| 37 # | 37 # |
| 38 B('Linux Builder x64', 'rel', 'compile', 'linux_rel') | 38 B('Linux Builder x64', 'rel', 'compile', 'linux_rel') |
| 39 F('rel', linux().ChromiumFactory( | 39 F('rel', linux().ChromiumFactory( |
| 40 slave_type='NASBuilder', | 40 slave_type='NASBuilder', |
| 41 options=['--compiler=goma', | 41 options=['--compiler=goma', |
| 42 'app_unittests', | |
| 43 'browser_tests', | 42 'browser_tests', |
| 44 'googleurl_unittests', | 43 'googleurl_unittests', |
| 45 'gpu_unittests', | 44 'gpu_unittests', |
| 46 'ipc_tests', | 45 'ipc_tests', |
| 47 'media_unittests', | 46 'media_unittests', |
| 48 'memory_test', | 47 'memory_test', |
| 49 'page_cycler_tests', | 48 'page_cycler_tests', |
| 50 'printing_unittests', | 49 'printing_unittests', |
| 51 'remoting_unittests', | 50 'remoting_unittests', |
| 52 'startup_tests', | 51 'startup_tests', |
| 53 'sync_unit_tests', | 52 'sync_unit_tests', |
| 54 'ui_tests', | 53 'ui_tests', |
| 55 'unit_tests', | 54 'unit_tests', |
| 56 'url_fetch_test', | 55 'url_fetch_test', |
| 57 'base_unittests', | 56 'base_unittests', |
| 58 'net_unittests', | 57 'net_unittests', |
| 59 'gfx_unittests', | 58 'gfx_unittests', |
| 60 'safe_browsing_tests', | 59 'safe_browsing_tests', |
| 60 'sql_unittests', |
| 61 'sync_integration_tests', | 61 'sync_integration_tests', |
| 62 'crypto_unittests', | 62 'crypto_unittests', |
| 63 'cacheinvalidation_unittests', | 63 'cacheinvalidation_unittests', |
| 64 'jingle_unittests'], | 64 'jingle_unittests'], |
| 65 factory_properties={'trigger': 'linux_rel_trigger'})) | 65 factory_properties={'trigger': 'linux_rel_trigger'})) |
| 66 | 66 |
| 67 # | 67 # |
| 68 # Linux Rel testers | 68 # Linux Rel testers |
| 69 # | 69 # |
| 70 B('Linux Tests x64', 'rel_unit', 'testers', 'linux_rel_trigger', | 70 B('Linux Tests x64', 'rel_unit', 'testers', 'linux_rel_trigger', |
| (...skipping 27 matching lines...) Expand all Loading... |
| 98 F('rel_touch', linux().ChromiumFactory( | 98 F('rel_touch', linux().ChromiumFactory( |
| 99 slave_type='BuilderTester', | 99 slave_type='BuilderTester', |
| 100 options=['--compiler=goma', | 100 options=['--compiler=goma', |
| 101 'base_unittests', | 101 'base_unittests', |
| 102 'crypto_unittests', | 102 'crypto_unittests', |
| 103 'googleurl_unittests', | 103 'googleurl_unittests', |
| 104 'gpu_unittests', | 104 'gpu_unittests', |
| 105 'ipc_tests', # from unit | 105 'ipc_tests', # from unit |
| 106 'sync_unit_tests', # from unit | 106 'sync_unit_tests', # from unit |
| 107 'unit_tests', # from unit | 107 'unit_tests', # from unit |
| 108 'app_unittests', # from unit | 108 'sql_unittests', # from unit |
| 109 'gfx_unittests', # from unit | 109 'gfx_unittests', # from unit |
| 110 'media_unittests', | 110 'media_unittests', |
| 111 'net_unittests', | 111 'net_unittests', |
| 112 'printing_unittests', | 112 'printing_unittests', |
| 113 'remoting_unittests', | 113 'remoting_unittests', |
| 114 'safe_browsing_tests', | 114 'safe_browsing_tests', |
| 115 ], | 115 ], |
| 116 tests=['check_deps', 'base', 'crypto', 'googleurl', 'gpu', 'media', 'net', | 116 tests=['check_deps', 'base', 'crypto', 'googleurl', 'gpu', 'media', 'net', |
| 117 'printing', 'remoting', 'safe_browsing', 'unit' ], | 117 'printing', 'remoting', 'safe_browsing', 'unit' ], |
| 118 factory_properties={'gclient_env': {'GYP_DEFINES':'touchui=1'}})) | 118 factory_properties={'gclient_env': {'GYP_DEFINES':'touchui=1'}})) |
| (...skipping 14 matching lines...) Expand all Loading... |
| 133 T('linux_dbg_shared_trigger') | 133 T('linux_dbg_shared_trigger') |
| 134 | 134 |
| 135 # | 135 # |
| 136 # Linux Dbg Builder | 136 # Linux Dbg Builder |
| 137 # | 137 # |
| 138 B('Linux Builder (dbg)', 'dbg', 'compile', 'linux_dbg') | 138 B('Linux Builder (dbg)', 'dbg', 'compile', 'linux_dbg') |
| 139 F('dbg', linux().ChromiumFactory( | 139 F('dbg', linux().ChromiumFactory( |
| 140 slave_type='NASBuilder', | 140 slave_type='NASBuilder', |
| 141 target='Debug', | 141 target='Debug', |
| 142 options=['--compiler=goma', | 142 options=['--compiler=goma', |
| 143 'app_unittests', | 143 'sql_unittests', |
| 144 'browser_tests', | 144 'browser_tests', |
| 145 'googleurl_unittests', | 145 'googleurl_unittests', |
| 146 'gpu_unittests', | 146 'gpu_unittests', |
| 147 'interactive_ui_tests', | 147 'interactive_ui_tests', |
| 148 'ipc_tests', | 148 'ipc_tests', |
| 149 'media_unittests', | 149 'media_unittests', |
| 150 'nacl_ui_tests', | 150 'nacl_ui_tests', |
| 151 'nacl_sandbox_tests', | 151 'nacl_sandbox_tests', |
| 152 'printing_unittests', | 152 'printing_unittests', |
| 153 'remoting_unittests', | 153 'remoting_unittests', |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 options=['--build-tool=make', '--compiler=clang'], | 246 options=['--build-tool=make', '--compiler=clang'], |
| 247 tests=['base', 'gfx', 'unit', 'crypto'], | 247 tests=['base', 'gfx', 'unit', 'crypto'], |
| 248 factory_properties={ | 248 factory_properties={ |
| 249 'gclient_env': { | 249 'gclient_env': { |
| 250 'GYP_DEFINES':'clang=1 clang_use_chrome_plugins=1 fastbuild=1' | 250 'GYP_DEFINES':'clang=1 clang_use_chrome_plugins=1 fastbuild=1' |
| 251 }})) | 251 }})) |
| 252 | 252 |
| 253 | 253 |
| 254 def Update(config, active_master, c): | 254 def Update(config, active_master, c): |
| 255 return helper.Update(c) | 255 return helper.Update(c) |
| OLD | NEW |