| Index: masters/master.devtools/master.cfg
|
| diff --git a/masters/master.devtools/master.cfg b/masters/master.devtools/master.cfg
|
| index 2db9c0bcf10c705f0bd7eddf4ca293a5ee94c837..f4cd6005c3a819578ac57a855a0cc95e8f0a57ea 100644
|
| --- a/masters/master.devtools/master.cfg
|
| +++ b/masters/master.devtools/master.cfg
|
| @@ -53,7 +53,7 @@ c['change_source'] = [cr_poller, webkit_poller]
|
|
|
| def linux(): return chromium_factory.ChromiumFactory('src/build', 'linux2')
|
|
|
| -factory_release = linux().ChromiumWebkitLatestFactory(
|
| +factory_release = linux().ChromiumFactory(
|
| target='Release',
|
| tests=['devtools_perf'],
|
| options=['--build-tool=ninja',
|
| @@ -68,8 +68,8 @@ factory_release = linux().ChromiumWebkitLatestFactory(
|
| 'gclient_env': {
|
| 'GYP_DEFINES':'release_extra_cflags="-fno-omit-frame-pointer"'
|
| }
|
| - }
|
| - )
|
| + 'blink_config': 'blink',
|
| + })
|
|
|
| builder_release = {
|
| 'name': 'x64 Release',
|
| @@ -80,7 +80,7 @@ builder_release = {
|
| }
|
|
|
|
|
| -factory_debug = linux().ChromiumWebkitLatestFactory(
|
| +factory_debug = linux().ChromiumFactory(
|
| target='Debug',
|
| tests=['devtools_perf'],
|
| options=['--build-tool=ninja',
|
| @@ -92,8 +92,8 @@ factory_debug = linux().ChromiumWebkitLatestFactory(
|
| factory_properties={
|
| 'perf_id': 'chromium-devtools-perf-debug',
|
| 'show_perf_results': True,
|
| - }
|
| - )
|
| + 'blink_config': 'blink',
|
| + })
|
|
|
| builder_debug = {
|
| 'name': 'x64 Debug',
|
| @@ -103,7 +103,7 @@ builder_debug = {
|
| 'auto_reboot': False
|
| }
|
|
|
| -factory_release_clang = linux().ChromiumWebkitLatestFactory(
|
| +factory_release_clang = linux().ChromiumFactory(
|
| target='Release',
|
| tests=['devtools_perf'],
|
| options=['--build-tool=ninja',
|
| @@ -117,9 +117,9 @@ factory_release_clang = linux().ChromiumWebkitLatestFactory(
|
| 'show_perf_results': True,
|
| 'gclient_env': {
|
| 'GYP_DEFINES':'clang=1 clang_use_chrome_plugins=1'
|
| - }
|
| - }
|
| - )
|
| + },
|
| + 'blink_config': 'blink',
|
| + })
|
|
|
| builder_release_clang = {
|
| 'name': 'x64 Release Clang',
|
|
|