Chromium Code Reviews| 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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 92 # ---------------------------------------------------------------------------- | 92 # ---------------------------------------------------------------------------- |
| 93 # FACTORIES | 93 # FACTORIES |
| 94 | 94 |
| 95 m_annotator = annotator_factory.AnnotatorFactory() | 95 m_annotator = annotator_factory.AnnotatorFactory() |
| 96 m_android = chromium_factory.ChromiumFactory( | 96 m_android = chromium_factory.ChromiumFactory( |
| 97 'src/build', 'linux2', nohooks_on_update=True, target_os='android') | 97 'src/build', 'linux2', nohooks_on_update=True, target_os='android') |
| 98 | 98 |
| 99 # Some shortcut to simplify the code below. | 99 # Some shortcut to simplify the code below. |
| 100 F_ANDROID = m_android.ChromiumAnnotationFactory | 100 F_ANDROID = m_android.ChromiumAnnotationFactory |
| 101 | 101 |
| 102 full_test_suite = [ | |
| 103 'content_gl_tests', | |
| 104 'gles2_conform_test', | |
| 105 'gl_tests', | |
| 106 'gpu_content_tests', | |
| 107 'gpu_frame_rate', | |
| 108 'gpu_throughput', | |
| 109 'tab_capture_performance', | |
| 110 ] | |
| 111 | |
| 112 debug_test_suite = [ | |
| 113 'content_gl_tests', | |
| 114 'gles2_conform_test', | |
| 115 'gl_tests', | |
| 116 'gpu_content_tests', | |
| 117 ] | |
| 118 | |
| 119 # TODO(kbr): switch the Android builder to use recipes too. | 102 # TODO(kbr): switch the Android builder to use recipes too. |
| 120 desktop_builders = [] | 103 desktop_builders = [] |
| 121 for slave in slaves.slaves: | 104 for slave in slaves.slaves: |
| 122 if not slave.get('is_android'): | 105 if not slave.get('is_android'): |
| 123 factory_properties = { | 106 factory_properties = { |
| 124 'test_results_server': 'test-results.appspot.com', | 107 'test_results_server': 'test-results.appspot.com', |
| 125 'generate_gtest_json': True, | 108 'generate_gtest_json': True, |
| 126 'build_config': 'Debug' | 109 'build_config': 'Debug' |
| 127 } | 110 } |
| 128 if 'perf_id' in slave: | 111 if 'perf_id' in slave: |
| 129 factory_properties['show_perf_results'] = True; | 112 factory_properties['show_perf_results'] = True |
|
agable
2013/09/27 19:57:26
wat
Ken Russell (switch to Gerrit)
2013/09/27 20:30:07
Temporary hack until we clean up how perf results
| |
| 130 factory_properties['perf_id'] = slave['perf_id'] | 113 factory_properties['perf_id'] = slave['perf_id'] |
| 131 factory_properties['build_config'] = 'Release' | 114 factory_properties['build_config'] = 'Release' |
| 132 desktop_builders.append({ | 115 desktop_builders.append({ |
| 133 'name': slave['builder'], | 116 'name': slave['builder'], |
| 134 'factory': m_annotator.BaseFactory('gpu', factory_properties) | 117 'factory': m_annotator.BaseFactory('gpu', factory_properties) |
| 135 }) | 118 }) |
| 136 | 119 |
| 137 f_android_nexus7_dbg = F_ANDROID( | 120 f_android_nexus7_dbg = F_ANDROID( |
| 138 target='Debug', | 121 target='Debug', |
| 139 slave_type='AnnotatedBuilder', | 122 slave_type='AnnotatedBuilder', |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 171 # Adds common status and tools to this master. | 154 # Adds common status and tools to this master. |
| 172 master_utils.AutoSetupMaster(c, ActiveMaster, | 155 master_utils.AutoSetupMaster(c, ActiveMaster, |
| 173 public_html='../master.chromium/public_html', | 156 public_html='../master.chromium/public_html', |
| 174 templates=['../master.chromium/templates'], | 157 templates=['../master.chromium/templates'], |
| 175 enable_http_status_push=ActiveMaster.is_production_host) | 158 enable_http_status_push=ActiveMaster.is_production_host) |
| 176 | 159 |
| 177 ####### PROJECT IDENTITY | 160 ####### PROJECT IDENTITY |
| 178 | 161 |
| 179 # Buildbot master url: | 162 # Buildbot master url: |
| 180 c['buildbotURL'] = 'http://build.chromium.org/p/chromium.gpu/' | 163 c['buildbotURL'] = 'http://build.chromium.org/p/chromium.gpu/' |
| OLD | NEW |