| 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 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 321 f_chromium_rel_win_drmemory_builder = F_WIN_NINJA( | 321 f_chromium_rel_win_drmemory_builder = F_WIN_NINJA( |
| 322 # TODO(timurrrr): reuse the builder for TSan/Win too once | 322 # TODO(timurrrr): reuse the builder for TSan/Win too once |
| 323 # http://crbug.com/108155 is resolved. | 323 # http://crbug.com/108155 is resolved. |
| 324 slave_type='Builder', | 324 slave_type='Builder', |
| 325 target='Release', | 325 target='Release', |
| 326 # TODO(bruening): remove "_dbg" from this name in all.gyp as it is | 326 # TODO(bruening): remove "_dbg" from this name in all.gyp as it is |
| 327 # not limited to just Debug. | 327 # not limited to just Debug. |
| 328 # TODO(timurrrr): Might wanna remove chromium_builder_dbg_drmemory_win | 328 # TODO(timurrrr): Might wanna remove chromium_builder_dbg_drmemory_win |
| 329 # entirely as ninja supports target lists similar to what we always had | 329 # entirely as ninja supports target lists similar to what we always had |
| 330 # on Linux. | 330 # on Linux. |
| 331 # TODO(zhaoqin|bruening): Temporarily using VS2013 due to bugs in DrMemory. |
| 332 # crbug.com/594808. |
| 331 options=['--build-tool=ninja', '--', 'chromium_builder_dbg_drmemory_win'], | 333 options=['--build-tool=ninja', '--', 'chromium_builder_dbg_drmemory_win'], |
| 332 factory_properties={ | 334 factory_properties={ |
| 333 'gclient_env': {'GYP_DEFINES': ('build_for_tool=drmemory ' | 335 'gclient_env': {'GYP_DEFINES': ('build_for_tool=drmemory ' |
| 334 'component=shared_library '), | 336 'component=shared_library '), |
| 337 'GYP_MSVS_VERSION': '2013', |
| 335 'GYP_GENERATORS': 'ninja'}, | 338 'GYP_GENERATORS': 'ninja'}, |
| 336 'package_pdb_files': True, | 339 'package_pdb_files': True, |
| 337 'trigger': 'chromium_win_drmemory', | 340 'trigger': 'chromium_win_drmemory', |
| 338 'build_url': chromium_win_drmemory_archive, | 341 'build_url': chromium_win_drmemory_archive, |
| 339 } | 342 } |
| 340 ) | 343 ) |
| 341 | 344 |
| 342 f_chromium_rel_win_drmemory = F_WIN_NINJA( | 345 f_chromium_rel_win_drmemory = F_WIN_NINJA( |
| 343 slave_type='Tester', | 346 slave_type='Tester', |
| 344 target='Release', | 347 target='Release', |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 518 ], | 521 ], |
| 519 factory_properties={'halt_on_missing_build': True}, | 522 factory_properties={'halt_on_missing_build': True}, |
| 520 ) | 523 ) |
| 521 | 524 |
| 522 # DrMemory x64 Builder | 525 # DrMemory x64 Builder |
| 523 f_chromium_rel_win_drmemory_64_builder = F_WIN_NINJA( | 526 f_chromium_rel_win_drmemory_64_builder = F_WIN_NINJA( |
| 524 slave_type='Builder', | 527 slave_type='Builder', |
| 525 target='Release_x64', | 528 target='Release_x64', |
| 526 # TODO(bruening): remove "_dbg" from this name in all.gyp as it is | 529 # TODO(bruening): remove "_dbg" from this name in all.gyp as it is |
| 527 # not limited to just Debug. | 530 # not limited to just Debug. |
| 531 # TODO(zhaoqin|bruening): Temporarily using VS2013 due to bugs in DrMemory. |
| 532 # crbug.com/594808. |
| 528 options=['--build-tool=ninja', '--', 'chromium_builder_dbg_drmemory_win'], | 533 options=['--build-tool=ninja', '--', 'chromium_builder_dbg_drmemory_win'], |
| 529 factory_properties={ | 534 factory_properties={ |
| 530 'gclient_env': { | 535 'gclient_env': { |
| 531 'GYP_DEFINES' : ( | 536 'GYP_DEFINES' : ( |
| 532 'build_for_tool=drmemory component=shared_library ' | 537 'build_for_tool=drmemory component=shared_library ' |
| 533 'target_arch=x64'), | 538 'target_arch=x64'), |
| 539 'GYP_MSVS_VERSION': '2013', |
| 534 'GYP_GENERATORS': 'ninja', | 540 'GYP_GENERATORS': 'ninja', |
| 535 }, | 541 }, |
| 536 'package_pdb_files': True, | 542 'package_pdb_files': True, |
| 537 'trigger': 'chromium_win_drmemory_64', | 543 'trigger': 'chromium_win_drmemory_64', |
| 538 'build_url': chromium_win_drmemory_64_archive, | 544 'build_url': chromium_win_drmemory_64_archive, |
| 539 } | 545 } |
| 540 ) | 546 ) |
| 541 | 547 |
| 542 # Windows Unit (DrMemory x64) | 548 # Windows Unit (DrMemory x64) |
| 543 f_chromium_rel_win_drmemory_64 = F_WIN_NINJA( | 549 f_chromium_rel_win_drmemory_64 = F_WIN_NINJA( |
| (...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1002 # Adds common status and tools to this master. | 1008 # Adds common status and tools to this master. |
| 1003 master_utils.AutoSetupMaster(c, ActiveMaster, | 1009 master_utils.AutoSetupMaster(c, ActiveMaster, |
| 1004 public_html='../master.chromium/public_html', | 1010 public_html='../master.chromium/public_html', |
| 1005 templates=['../master.chromium/templates'], | 1011 templates=['../master.chromium/templates'], |
| 1006 tagComparator=master_poller.comparator, | 1012 tagComparator=master_poller.comparator, |
| 1007 enable_http_status_push=ActiveMaster.is_production_host) | 1013 enable_http_status_push=ActiveMaster.is_production_host) |
| 1008 | 1014 |
| 1009 if ActiveMaster.is_production_host: | 1015 if ActiveMaster.is_production_host: |
| 1010 import notifier_cfg | 1016 import notifier_cfg |
| 1011 notifier_cfg.Update(config, ActiveMaster, c) | 1017 notifier_cfg.Update(config, ActiveMaster, c) |
| OLD | NEW |