| Index: build/masters/master.tryserver.chromium/master.cfg
|
| ===================================================================
|
| --- build/masters/master.tryserver.chromium/master.cfg (revision 102013)
|
| +++ build/masters/master.tryserver.chromium/master.cfg (working copy)
|
| @@ -186,23 +186,23 @@
|
| 'jingle',
|
| 'dbus',]
|
| b_linux = CreateBuilder(platform='linux',
|
| - target='Debug',
|
| + target='Release',
|
| options=['--compiler=goma'],
|
| tests=linux_tests,
|
| builder_name='linux',
|
| sharding_supervisor=True,
|
| - unsharded_tests=linux_unsharded)
|
| + unsharded_tests=linux_unsharded,
|
| + extra_gyp_defines='dcheck_always_on=1')
|
| pools['chrome'].append('linux')
|
|
|
| -b_linux_rel = CreateBuilder(platform='linux',
|
| - target='Release',
|
| +b_linux_dbg = CreateBuilder(platform='linux',
|
| + target='Debug',
|
| options=['--compiler=goma'],
|
| tests=linux_tests,
|
| - builder_name='linux_rel',
|
| + builder_name='linux_dbg',
|
| slavebuilddir='linux',
|
| sharding_supervisor=True,
|
| - unsharded_tests=linux_unsharded,
|
| - extra_gyp_defines='dcheck_always_on=1')
|
| + unsharded_tests=linux_unsharded)
|
|
|
|
|
| # Tests that are not single-machine shard-safe on MacOS
|
| @@ -238,19 +238,20 @@
|
| 'cacheinvalidation',
|
| 'jingle']
|
| b_mac = CreateBuilder(platform='mac',
|
| - target='Debug',
|
| + target='Release',
|
| tests=mac_tests,
|
| options=['--compiler=goma-clang'],
|
| - extra_gyp_defines='clang=1 clang_use_chrome_plugins=1',
|
| + extra_gyp_defines=
|
| + 'dcheck_always_on=1 clang=1 clang_use_chrome_plugins=1',
|
| builder_name='mac',
|
| sharding_supervisor=True,
|
| unsharded_tests=mac_unsharded)
|
| pools['chrome'].append('mac')
|
|
|
| -b_mac_rel = CreateBuilder(platform='mac',
|
| - target='Release',
|
| +b_mac_dbg = CreateBuilder(platform='mac',
|
| + target='Debug',
|
| tests=mac_tests,
|
| - builder_name='mac_rel',
|
| + builder_name='mac_dbg',
|
| options=['--compiler=goma-clang'],
|
| extra_gyp_defines=
|
| ('clang=1 ' +
|
| @@ -298,22 +299,22 @@
|
| 'pyauto_functional_tests',
|
| 'cacheinvalidation',
|
| 'jingle']
|
| -b_win = CreateBuilder(target='Debug',
|
| +b_win = CreateBuilder(target='Release',
|
| platform='win32',
|
| tests=win_tests,
|
| builder_name='win',
|
| sharding_supervisor=True,
|
| - unsharded_tests=win_unsharded)
|
| + unsharded_tests=win_unsharded,
|
| + extra_gyp_defines='dcheck_always_on=1')
|
| pools['chrome'].append('win')
|
|
|
| -b_win_rel = CreateBuilder(target='Release',
|
| +b_win_dbg = CreateBuilder(target='Debug',
|
| platform='win32',
|
| tests=win_tests,
|
| - builder_name='win_rel',
|
| + builder_name='win_dbg',
|
| slavebuilddir='win',
|
| sharding_supervisor=True,
|
| - unsharded_tests=win_unsharded,
|
| - extra_gyp_defines='dcheck_always_on=1')
|
| + unsharded_tests=win_unsharded)
|
|
|
|
|
| # TOOLKIT_VIEWS builder
|
| @@ -823,7 +824,7 @@
|
| b_valgrind_linux, b_valgrind_mac,
|
| b_chromium_chromiumos_valgrind, b_tsan_linux,
|
| b_linux_layout, b_mac_layout, b_win_layout,
|
| - b_linux_rel, b_mac_rel, b_win_rel,
|
| + b_linux_dbg, b_mac_dbg, b_win_dbg,
|
| b_linux_layout_rel, b_mac_layout_rel, b_win_layout_rel,
|
| b_coverage_linux,
|
| b_linux_sync, b_mac_sync, b_win_sync,
|
|
|