| 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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 208 # | 208 # |
| 209 | 209 |
| 210 B('Mac Clang (dbg)', 'dbg_mac_clang', 'compile', 'mac_dbg') | 210 B('Mac Clang (dbg)', 'dbg_mac_clang', 'compile', 'mac_dbg') |
| 211 F('dbg_mac_clang', mac().ChromiumFactory( | 211 F('dbg_mac_clang', mac().ChromiumFactory( |
| 212 target='Debug', | 212 target='Debug', |
| 213 options=['--compiler=clang'], | 213 options=['--compiler=clang'], |
| 214 # Only include test binaries that run reasonably fast and that don't contain | 214 # Only include test binaries that run reasonably fast and that don't contain |
| 215 # many flaky tests. | 215 # many flaky tests. |
| 216 tests=[ | 216 tests=[ |
| 217 'base', 'gfx', 'crypto', | 217 'base', 'gfx', 'crypto', |
| 218 # Adds ipc_tests, sync_unit_tests, unit_tests, and app_unittests | 218 # Adds ipc_tests, sync_unit_tests, unit_tests, and sql_unittests |
| 219 # unit_tests is very flaky due to http://crbug.com/60426 | 219 # unit_tests is very flaky due to http://crbug.com/60426 |
| 220 # TODO(thakis): Re-add this once the bug is fixed. | 220 # TODO(thakis): Re-add this once the bug is fixed. |
| 221 #'unit', | 221 #'unit', |
| 222 ], | 222 ], |
| 223 factory_properties={ | 223 factory_properties={ |
| 224 'gclient_env': { | 224 'gclient_env': { |
| 225 'GYP_DEFINES':'clang=1 clang_use_chrome_plugins=1' | 225 'GYP_DEFINES':'clang=1 clang_use_chrome_plugins=1' |
| 226 }})) | 226 }})) |
| 227 | 227 |
| 228 | 228 |
| 229 def Update(config, active_master, c): | 229 def Update(config, active_master, c): |
| 230 return helper.Update(c) | 230 return helper.Update(c) |
| OLD | NEW |