| 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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 F_MAC = m_mac.ChromiumGPUFactory | 90 F_MAC = m_mac.ChromiumGPUFactory |
| 91 F_LINUX = m_linux.ChromiumGPUFactory | 91 F_LINUX = m_linux.ChromiumGPUFactory |
| 92 | 92 |
| 93 | 93 |
| 94 f_win7_nvidia_rel = F_WIN( | 94 f_win7_nvidia_rel = F_WIN( |
| 95 project='all.sln;chromium_gpu_builder', | 95 project='all.sln;chromium_gpu_builder', |
| 96 target='Release', | 96 target='Release', |
| 97 slave_type='BuilderTester', | 97 slave_type='BuilderTester', |
| 98 tests=['gpu_tests', 'gpu_frame_rate', 'gpu_latency', 'gpu_throughput'], | 98 tests=['gpu_tests', 'gpu_frame_rate', 'gpu_latency', 'gpu_throughput'], |
| 99 factory_properties={'gclient_env': {'GYP_DEFINES': 'fastbuild=1'}, | 99 factory_properties={'gclient_env': {'GYP_DEFINES': 'fastbuild=1'}, |
| 100 'perf_id': 'gpu-win7-release-nvidia', |
| 101 'show_perf_results': True, |
| 100 'test_results_server': 'test-results.appspot.com', | 102 'test_results_server': 'test-results.appspot.com', |
| 101 'generate_gtest_json': True}) | 103 'generate_gtest_json': True}) |
| 102 | 104 |
| 103 f_win7_nvidia_dbg = F_WIN( | 105 f_win7_nvidia_dbg = F_WIN( |
| 104 project='all.sln;chromium_gpu_debug_builder', | 106 project='all.sln;chromium_gpu_debug_builder', |
| 105 target='Debug', | 107 target='Debug', |
| 106 slave_type='BuilderTester', | 108 slave_type='BuilderTester', |
| 107 tests=['gpu_tests'], | 109 tests=['gpu_tests'], |
| 108 factory_properties={'gclient_env': {'GYP_DEFINES': 'fastbuild=1'}, | 110 factory_properties={'gclient_env': {'GYP_DEFINES': 'fastbuild=1'}, |
| 109 'test_results_server': 'test-results.appspot.com', | 111 'test_results_server': 'test-results.appspot.com', |
| 110 'generate_gtest_json': True}) | 112 'generate_gtest_json': True}) |
| 111 | 113 |
| 112 f_mac_intel_rel = F_MAC( | 114 f_mac_intel_rel = F_MAC( |
| 113 target='Release', | 115 target='Release', |
| 114 slave_type='BuilderTester', | 116 slave_type='BuilderTester', |
| 115 options=['--build-tool=make', '--compiler=goma-clang', | 117 options=['--build-tool=make', '--compiler=goma-clang', |
| 116 'chromium_gpu_builder'], | 118 'chromium_gpu_builder'], |
| 117 tests=['gpu_tests', 'gpu_frame_rate', 'gpu_latency', 'gpu_throughput'], | 119 tests=['gpu_tests', 'gpu_frame_rate', 'gpu_latency', 'gpu_throughput'], |
| 118 factory_properties={'test_results_server': 'test-results.appspot.com', | 120 factory_properties={'test_results_server': 'test-results.appspot.com', |
| 121 'perf_id': 'gpu-mac-release-intel', |
| 122 'show_perf_results': True, |
| 119 'generate_gtest_json': True, | 123 'generate_gtest_json': True, |
| 120 'gclient_env': { | 124 'gclient_env': { |
| 121 'GYP_GENERATORS': 'make', | 125 'GYP_GENERATORS': 'make', |
| 122 'GYP_DEFINES': 'fastbuild=1', | 126 'GYP_DEFINES': 'fastbuild=1', |
| 123 } | 127 } |
| 124 }) | 128 }) |
| 125 | 129 |
| 126 f_mac_intel_dbg = F_MAC( | 130 f_mac_intel_dbg = F_MAC( |
| 127 target='Debug', | 131 target='Debug', |
| 128 slave_type='BuilderTester', | 132 slave_type='BuilderTester', |
| 129 options=['--build-tool=make', '--compiler=goma-clang', | 133 options=['--build-tool=make', '--compiler=goma-clang', |
| 130 'chromium_gpu_debug_builder'], | 134 'chromium_gpu_debug_builder'], |
| 131 tests=['gpu_tests'], | 135 tests=['gpu_tests'], |
| 132 factory_properties={'test_results_server': 'test-results.appspot.com', | 136 factory_properties={'test_results_server': 'test-results.appspot.com', |
| 133 'generate_gtest_json': True, | 137 'generate_gtest_json': True, |
| 134 'gclient_env': { | 138 'gclient_env': { |
| 135 'GYP_GENERATORS': 'make', | 139 'GYP_GENERATORS': 'make', |
| 136 'GYP_DEFINES': 'fastbuild=1', | 140 'GYP_DEFINES': 'fastbuild=1', |
| 137 } | 141 } |
| 138 }) | 142 }) |
| 139 | 143 |
| 140 f_linux_nvidia_rel = F_LINUX( | 144 f_linux_nvidia_rel = F_LINUX( |
| 141 target='Release', | 145 target='Release', |
| 142 slave_type='BuilderTester', | 146 slave_type='BuilderTester', |
| 143 options=['chromium_gpu_builder'], | 147 options=['chromium_gpu_builder'], |
| 144 tests=['gpu_tests', 'gpu_frame_rate', 'gpu_latency', 'gpu_throughput'], | 148 tests=['gpu_tests', 'gpu_frame_rate', 'gpu_latency', 'gpu_throughput'], |
| 145 factory_properties={'test_results_server': 'test-results.appspot.com', | 149 factory_properties={'test_results_server': 'test-results.appspot.com', |
| 150 'perf_id': 'gpu-linux-release-nvidia', |
| 151 'show_perf_results': True, |
| 146 'generate_gtest_json': True}) | 152 'generate_gtest_json': True}) |
| 147 | 153 |
| 148 f_linux_nvidia_dbg = F_LINUX( | 154 f_linux_nvidia_dbg = F_LINUX( |
| 149 target='Debug', | 155 target='Debug', |
| 150 slave_type='BuilderTester', | 156 slave_type='BuilderTester', |
| 151 options=['chromium_gpu_debug_builder'], | 157 options=['chromium_gpu_debug_builder'], |
| 152 tests=['gpu_tests'], | 158 tests=['gpu_tests'], |
| 153 factory_properties={'test_results_server': 'test-results.appspot.com', | 159 factory_properties={'test_results_server': 'test-results.appspot.com', |
| 154 'generate_gtest_json': True}) | 160 'generate_gtest_json': True}) |
| 155 | 161 |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 # Adds common status and tools to this master. | 212 # Adds common status and tools to this master. |
| 207 master_utils.AutoSetupMaster(c, ActiveMaster, | 213 master_utils.AutoSetupMaster(c, ActiveMaster, |
| 208 public_html='../master.chromium/public_html', | 214 public_html='../master.chromium/public_html', |
| 209 templates=['../master.chromium/templates'], | 215 templates=['../master.chromium/templates'], |
| 210 enable_http_status_push=ActiveMaster.is_production_host) | 216 enable_http_status_push=ActiveMaster.is_production_host) |
| 211 | 217 |
| 212 ####### PROJECT IDENTITY | 218 ####### PROJECT IDENTITY |
| 213 | 219 |
| 214 # Buildbot master url: | 220 # Buildbot master url: |
| 215 c['buildbotURL'] = 'http://build.chromium.org/p/chromium.gpu/' | 221 c['buildbotURL'] = 'http://build.chromium.org/p/chromium.gpu/' |
| OLD | NEW |