| 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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 tests=['browser_tests', 'net', 'ui',], | 121 tests=['browser_tests', 'net', 'ui',], |
| 122 factory_properties={'generate_gtest_json': True, | 122 factory_properties={'generate_gtest_json': True, |
| 123 'ui_total_shards': 3, 'ui_shard_index': 3, | 123 'ui_total_shards': 3, 'ui_shard_index': 3, |
| 124 'browser_total_shards': 3, 'browser_shard_index': 3,})) | 124 'browser_total_shards': 3, 'browser_shard_index': 3,})) |
| 125 | 125 |
| 126 B('Linux Builder (Views dbg)', 'view_dbg', 'compile', 'chromeos_dbg') | 126 B('Linux Builder (Views dbg)', 'view_dbg', 'compile', 'chromeos_dbg') |
| 127 F('view_dbg', chromeos().ChromiumOSFactory( | 127 F('view_dbg', chromeos().ChromiumOSFactory( |
| 128 slave_type='NASBuilder', | 128 slave_type='NASBuilder', |
| 129 target='Debug', | 129 target='Debug', |
| 130 options=['--compiler=goma', | 130 options=['--compiler=goma', |
| 131 'app_unittests', | |
| 132 'base_unittests', | 131 'base_unittests', |
| 133 'browser_tests', | 132 'browser_tests', |
| 134 'interactive_ui_tests', | 133 'interactive_ui_tests', |
| 135 'ipc_tests', | 134 'ipc_tests', |
| 136 'googleurl_unittests', | 135 'googleurl_unittests', |
| 137 'media_unittests', | 136 'media_unittests', |
| 138 'net_unittests', | 137 'net_unittests', |
| 139 'printing_unittests', | 138 'printing_unittests', |
| 140 'remoting_unittests', | 139 'remoting_unittests', |
| 140 'sql_unittests', |
| 141 'sync_unit_tests', | 141 'sync_unit_tests', |
| 142 'ui_tests', | 142 'ui_tests', |
| 143 'unit_tests', | 143 'unit_tests', |
| 144 'views_unittests', | 144 'views_unittests', |
| 145 'gfx_unittests', | 145 'gfx_unittests', |
| 146 'crypto_unittests', | 146 'crypto_unittests', |
| 147 'cacheinvalidation_unittests', | 147 'cacheinvalidation_unittests', |
| 148 'jingle_unittests'], | 148 'jingle_unittests'], |
| 149 factory_properties={'gclient_env': | 149 factory_properties={'gclient_env': |
| 150 {'GYP_DEFINES':'toolkit_views=1 chromeos=1'}, | 150 {'GYP_DEFINES':'toolkit_views=1 chromeos=1'}, |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 'jingle'], | 209 'jingle'], |
| 210 factory_properties={ | 210 factory_properties={ |
| 211 'gclient_env': { | 211 'gclient_env': { |
| 212 'GYP_DEFINES':'clang=1 clang_use_chrome_plugins=1 ' + | 212 'GYP_DEFINES':'clang=1 clang_use_chrome_plugins=1 ' + |
| 213 'chromeos=1 fastbuild=1 target_arch=ia32' | 213 'chromeos=1 fastbuild=1 target_arch=ia32' |
| 214 }})) | 214 }})) |
| 215 | 215 |
| 216 | 216 |
| 217 def Update(config, active_master, c): | 217 def Update(config, active_master, c): |
| 218 return helper.Update(c) | 218 return helper.Update(c) |
| OLD | NEW |