| 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.changes import svnpoller | 5 from buildbot.changes import svnpoller |
| 6 from buildbot.scheduler import Dependent | 6 from buildbot.scheduler import Dependent |
| 7 from buildbot.scheduler import Scheduler | 7 from buildbot.scheduler import Scheduler |
| 8 | 8 |
| 9 from master import build_utils | 9 from master import build_utils |
| 10 from master import master_config | 10 from master import master_config |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 262 target='Release', | 262 target='Release', |
| 263 slave_type='BuilderTester', | 263 slave_type='BuilderTester', |
| 264 options=['chromium_gpu_builder'], | 264 options=['chromium_gpu_builder'], |
| 265 tests=full_test_suite, | 265 tests=full_test_suite, |
| 266 factory_properties={ | 266 factory_properties={ |
| 267 'test_results_server': 'test-results.appspot.com', | 267 'test_results_server': 'test-results.appspot.com', |
| 268 'perf_id': 'gpu-linux-release-nvidia', | 268 'perf_id': 'gpu-linux-release-nvidia', |
| 269 'show_perf_results': True, | 269 'show_perf_results': True, |
| 270 'generate_gtest_json': True, | 270 'generate_gtest_json': True, |
| 271 'gclient_env': { | 271 'gclient_env': { |
| 272 'GYP_DEFINES': 'fastbuild=1 internal_gles2_conform_tests=1', | 272 # tcmalloc disabled because of hangs: http://crbug.com/177218 . |
| 273 'GYP_DEFINES': 'fastbuild=1 internal_gles2_conform_tests=1 ' |
| 274 'linux_use_tcmalloc=0', |
| 273 }, | 275 }, |
| 274 }) | 276 }) |
| 275 | 277 |
| 276 f_linux_nvidia_dbg = F_LINUX( | 278 f_linux_nvidia_dbg = F_LINUX( |
| 277 target='Debug', | 279 target='Debug', |
| 278 slave_type='BuilderTester', | 280 slave_type='BuilderTester', |
| 279 options=['chromium_gpu_debug_builder'], | 281 options=['chromium_gpu_debug_builder'], |
| 280 tests=debug_test_suite, | 282 tests=debug_test_suite, |
| 281 factory_properties={ | 283 factory_properties={ |
| 282 'test_results_server': 'test-results.appspot.com', | 284 'test_results_server': 'test-results.appspot.com', |
| 283 'generate_gtest_json': True, | 285 'generate_gtest_json': True, |
| 284 'gclient_env': { | 286 'gclient_env': { |
| 285 'GYP_DEFINES': 'fastbuild=1 internal_gles2_conform_tests=1', | 287 # tcmalloc disabled because of hangs: http://crbug.com/177218 . |
| 288 'GYP_DEFINES': 'fastbuild=1 internal_gles2_conform_tests=1 ' |
| 289 'linux_use_tcmalloc=0', |
| 286 }, | 290 }, |
| 287 }) | 291 }) |
| 288 | 292 |
| 289 f_linux_ati_rel = F_LINUX( | 293 f_linux_ati_rel = F_LINUX( |
| 290 target='Release', | 294 target='Release', |
| 291 slave_type='BuilderTester', | 295 slave_type='BuilderTester', |
| 292 options=['chromium_gpu_builder'], | 296 options=['chromium_gpu_builder'], |
| 293 tests=full_test_suite, | 297 tests=full_test_suite, |
| 294 factory_properties={ | 298 factory_properties={ |
| 295 'perf_id': 'gpu-fyi-linux-release-ati', | 299 'perf_id': 'gpu-fyi-linux-release-ati', |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 389 # Adds common status and tools to this master. | 393 # Adds common status and tools to this master. |
| 390 master_utils.AutoSetupMaster(c, ActiveMaster, | 394 master_utils.AutoSetupMaster(c, ActiveMaster, |
| 391 public_html='../master.chromium/public_html', | 395 public_html='../master.chromium/public_html', |
| 392 templates=['../master.chromium/templates'], | 396 templates=['../master.chromium/templates'], |
| 393 enable_http_status_push=ActiveMaster.is_production_host) | 397 enable_http_status_push=ActiveMaster.is_production_host) |
| 394 | 398 |
| 395 ####### PROJECT IDENTITY | 399 ####### PROJECT IDENTITY |
| 396 | 400 |
| 397 # Buildbot master url: | 401 # Buildbot master url: |
| 398 c['buildbotURL'] = 'http://build.chromium.org/p/chromium.gpu/' | 402 c['buildbotURL'] = 'http://build.chromium.org/p/chromium.gpu/' |
| OLD | NEW |