Chromium Code Reviews| 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 import master_site_config | 8 import master_site_config |
| 9 | 9 |
| 10 ActiveMaster = master_site_config.Chromium | 10 ActiveMaster = master_site_config.Chromium |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 55 'start_crash_handler': True, | 55 'start_crash_handler': True, |
| 56 'generate_gtest_json': ActiveMaster.is_production_host, | 56 'generate_gtest_json': ActiveMaster.is_production_host, |
| 57 'gclient_env': { | 57 'gclient_env': { |
| 58 'GYP_DEFINES': 'test_isolation_mode=noop', | 58 'GYP_DEFINES': 'test_isolation_mode=noop', |
| 59 }, | 59 }, |
| 60 })) | 60 })) |
| 61 | 61 |
| 62 B('Win Split', 'win_split', 'compile|windows', 'chromium') | 62 B('Win Split', 'win_split', 'compile|windows', 'chromium') |
| 63 F('win_split', win_out().ChromiumFactory( | 63 F('win_split', win_out().ChromiumFactory( |
| 64 target='Release', | 64 target='Release', |
| 65 options=['--build-tool=ninja'], | 65 options=['--build-tool=ninja', 'chromium_builder_tests'], |
|
iannucci
2013/05/23 23:21:19
add a '--' in between these two
| |
| 66 factory_properties={ | 66 factory_properties={ |
| 67 'process_dumps': True, | 67 'process_dumps': True, |
| 68 'start_crash_handler': True, | 68 'start_crash_handler': True, |
| 69 'gclient_env': { | 69 'gclient_env': { |
| 70 'GYP_DEFINES': 'fastbuild=1 chrome_split_dll=1', | 70 'GYP_DEFINES': 'fastbuild=1 chrome_split_dll=1', |
| 71 'GYP_GENERATORS': 'ninja', | 71 'GYP_GENERATORS': 'ninja', |
| 72 }, | 72 }, |
| 73 })) | 73 })) |
| 74 | 74 |
| 75 | 75 |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 170 'gs_bucket': 'gs://chromium-browser-snapshots', | 170 'gs_bucket': 'gs://chromium-browser-snapshots', |
| 171 'perf_id': 'android-release', | 171 'perf_id': 'android-release', |
| 172 'show_perf_results': True, | 172 'show_perf_results': True, |
| 173 }, | 173 }, |
| 174 annotation_script='src/build/android/buildbot/bb_run_bot.py', | 174 annotation_script='src/build/android/buildbot/bb_run_bot.py', |
| 175 )) | 175 )) |
| 176 | 176 |
| 177 | 177 |
| 178 def Update(_config, active_master, c): | 178 def Update(_config, active_master, c): |
| 179 return helper.Update(c) | 179 return helper.Update(c) |
| OLD | NEW |