| 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 buildbot.scheduler import Triggerable | 5 from buildbot.scheduler import Triggerable |
| 6 from buildbot.scheduler import Scheduler | 6 from buildbot.scheduler import Scheduler |
| 7 | 7 |
| 8 from common import chromium_utils | 8 from common import chromium_utils |
| 9 | 9 |
| 10 # These modules come from scripts/master, which must be in the PYTHONPATH. | 10 # These modules come from scripts/master, which must be in the PYTHONPATH. |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 f_chromium_rel_win_drmemory_builder = F_WIN_NINJA( | 165 f_chromium_rel_win_drmemory_builder = F_WIN_NINJA( |
| 166 # TODO(timurrrr): reuse the builder for TSan/Win too once | 166 # TODO(timurrrr): reuse the builder for TSan/Win too once |
| 167 # http://crbug.com/108155 is resolved. | 167 # http://crbug.com/108155 is resolved. |
| 168 slave_type='Builder', | 168 slave_type='Builder', |
| 169 target='Release', | 169 target='Release', |
| 170 # TODO(bruening): remove "_dbg" from this name in all.gyp as it is | 170 # TODO(bruening): remove "_dbg" from this name in all.gyp as it is |
| 171 # not limited to just Debug. | 171 # not limited to just Debug. |
| 172 # TODO(timurrrr): Might wanna remove chromium_builder_dbg_drmemory_win | 172 # TODO(timurrrr): Might wanna remove chromium_builder_dbg_drmemory_win |
| 173 # entirely as ninja supports target lists similar to what we always had | 173 # entirely as ninja supports target lists similar to what we always had |
| 174 # on Linux. | 174 # on Linux. |
| 175 options=['--build-tool=ninja', '--', 'chromium_builder_dbg_drmemory_win'], | 175 options=['chromium_builder_dbg_drmemory_win'], |
| 176 factory_properties={ | 176 factory_properties={ |
| 177 'gclient_env': {'GYP_DEFINES': ('build_for_tool=drmemory ' | 177 'gclient_env': {'GYP_DEFINES': ('build_for_tool=drmemory ' |
| 178 'component=shared_library '), | 178 'component=shared_library '), |
| 179 'GYP_GENERATORS': 'ninja'}, | 179 'GYP_GENERATORS': 'ninja'}, |
| 180 'trigger': 'chromium_win_drmemory', | 180 'trigger': 'chromium_win_drmemory', |
| 181 'build_url': chromium_win_drmemory_archive, | 181 'build_url': chromium_win_drmemory_archive, |
| 182 'use_mb': True, | 182 'use_mb': True, |
| 183 } | 183 } |
| 184 ) | 184 ) |
| 185 | 185 |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 360 ], | 360 ], |
| 361 factory_properties={'halt_on_missing_build': True}, | 361 factory_properties={'halt_on_missing_build': True}, |
| 362 ) | 362 ) |
| 363 | 363 |
| 364 # DrMemory x64 Builder | 364 # DrMemory x64 Builder |
| 365 f_chromium_rel_win_drmemory_64_builder = F_WIN_NINJA( | 365 f_chromium_rel_win_drmemory_64_builder = F_WIN_NINJA( |
| 366 slave_type='Builder', | 366 slave_type='Builder', |
| 367 target='Release_x64', | 367 target='Release_x64', |
| 368 # TODO(bruening): remove "_dbg" from this name in all.gyp as it is | 368 # TODO(bruening): remove "_dbg" from this name in all.gyp as it is |
| 369 # not limited to just Debug. | 369 # not limited to just Debug. |
| 370 options=['--build-tool=ninja', '--', 'chromium_builder_dbg_drmemory_win'], | 370 options=['chromium_builder_dbg_drmemory_win'], |
| 371 factory_properties={ | 371 factory_properties={ |
| 372 'gclient_env': { | 372 'gclient_env': { |
| 373 'GYP_DEFINES' : ( | 373 'GYP_DEFINES' : ( |
| 374 'build_for_tool=drmemory component=shared_library ' | 374 'build_for_tool=drmemory component=shared_library ' |
| 375 'target_arch=x64'), | 375 'target_arch=x64'), |
| 376 'GYP_GENERATORS': 'ninja', | 376 'GYP_GENERATORS': 'ninja', |
| 377 }, | 377 }, |
| 378 'trigger': 'chromium_win_drmemory_64', | 378 'trigger': 'chromium_win_drmemory_64', |
| 379 'build_url': chromium_win_drmemory_64_archive, | 379 'build_url': chromium_win_drmemory_64_archive, |
| 380 'use_mb': True, | 380 'use_mb': True, |
| (...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 721 # Adds common status and tools to this master. | 721 # Adds common status and tools to this master. |
| 722 master_utils.AutoSetupMaster(c, ActiveMaster, | 722 master_utils.AutoSetupMaster(c, ActiveMaster, |
| 723 public_html='../master.chromium/public_html', | 723 public_html='../master.chromium/public_html', |
| 724 templates=['../master.chromium/templates'], | 724 templates=['../master.chromium/templates'], |
| 725 tagComparator=master_poller.comparator, | 725 tagComparator=master_poller.comparator, |
| 726 enable_http_status_push=ActiveMaster.is_production_host) | 726 enable_http_status_push=ActiveMaster.is_production_host) |
| 727 | 727 |
| 728 if ActiveMaster.is_production_host: | 728 if ActiveMaster.is_production_host: |
| 729 import notifier_cfg | 729 import notifier_cfg |
| 730 notifier_cfg.Update(config, ActiveMaster, c) | 730 notifier_cfg.Update(config, ActiveMaster, c) |
| OLD | NEW |