Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Side by Side Diff: scripts/slave/recipes/gpu.py

Issue 44923002: Added GLib/DBus workaround to runtest.py under --do-dbus-workaround option. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Addressed stip's review feedback. Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 # This recipe is intended to control all of the GPU related bots: 5 # This recipe is intended to control all of the GPU related bots:
6 # chromium.gpu 6 # chromium.gpu
7 # chromium.gpu.fyi 7 # chromium.gpu.fyi
8 # The GPU bots on the chromium.webkit waterfall 8 # The GPU bots on the chromium.webkit waterfall
9 # The GPU bots on the tryserver.chromium waterfall 9 # The GPU bots on the tryserver.chromium waterfall
10 10
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 91
92 # TODO(kbr): currently some properties are passed to runtest.py via 92 # TODO(kbr): currently some properties are passed to runtest.py via
93 # factory_properties in the master.cfg: generate_gtest_json, 93 # factory_properties in the master.cfg: generate_gtest_json,
94 # show_perf_results, test_results_server, and perf_id. runtest.py 94 # show_perf_results, test_results_server, and perf_id. runtest.py
95 # should be modified to take these arguments on the command line, 95 # should be modified to take these arguments on the command line,
96 # and the setting of these properties should happen in this recipe 96 # and the setting of these properties should happen in this recipe
97 # instead. 97 # instead.
98 98
99 # Note: --no-xvfb is the default. 99 # Note: --no-xvfb is the default.
100 for test in SIMPLE_TESTS_TO_RUN: 100 for test in SIMPLE_TESTS_TO_RUN:
101 yield api.chromium.runtests(test) 101 yield api.chromium.runtests(test, spawn_dbus=True)
102 102
103 # Former gpu_content_tests step 103 # Former gpu_content_tests step
104 args = ['--use-gpu-in-tests', 104 args = ['--use-gpu-in-tests',
105 '--gtest_filter=Gpu*.*', 105 '--gtest_filter=Gpu*.*',
106 '--ui-test-action-max-timeout=45000', 106 '--ui-test-action-max-timeout=45000',
107 '--run-manual'] 107 '--run-manual']
108 yield api.chromium.runtests('content_browsertests', 108 yield api.chromium.runtests('content_browsertests',
109 args, 109 args,
110 annotate='gtest', 110 annotate='gtest',
111 test_type='content_browsertests', 111 test_type='content_browsertests',
112 generate_json_file=True, 112 generate_json_file=True,
113 results_directory= 113 results_directory=
114 api.path.slave_build('gtest-results', 114 api.path.slave_build('gtest-results',
115 'content_browsertests'), 115 'content_browsertests'),
116 build_number=api.properties['buildnumber'], 116 build_number=api.properties['buildnumber'],
117 builder_name=api.properties['buildername']) 117 builder_name=api.properties['buildername'],
118 spawn_dbus=True)
118 119
119 # Choose a reasonable default for the location of the sandbox binary 120 # Choose a reasonable default for the location of the sandbox binary
120 # on the bots. 121 # on the bots.
121 env = {} 122 env = {}
122 if api.platform.is_linux: 123 if api.platform.is_linux:
123 env['CHROME_DEVEL_SANDBOX'] = '/opt/chromium/chrome_sandbox' 124 env['CHROME_DEVEL_SANDBOX'] = '/opt/chromium/chrome_sandbox'
124 125
125 # Pixel tests. 126 # Pixel tests.
126 yield api.gpu.run_telemetry_gpu_test('pixel_test', 127 yield api.gpu.run_telemetry_gpu_test('pixel_test',
127 args=[ 128 args=[
(...skipping 26 matching lines...) Expand all
154 if is_release_build: 155 if is_release_build:
155 # Former tab_capture_performance_tests_step 156 # Former tab_capture_performance_tests_step
156 args = ['--enable-gpu', 157 args = ['--enable-gpu',
157 '--gtest_filter=TabCapturePerformanceTest*'] 158 '--gtest_filter=TabCapturePerformanceTest*']
158 yield api.chromium.runtests('performance_browser_tests', 159 yield api.chromium.runtests('performance_browser_tests',
159 args, 160 args,
160 name='tab_capture_performance_tests', 161 name='tab_capture_performance_tests',
161 annotate='graphing', 162 annotate='graphing',
162 results_url=dashboard_upload_url, 163 results_url=dashboard_upload_url,
163 perf_dashboard_id='tab_capture_performance', 164 perf_dashboard_id='tab_capture_performance',
164 test_type='tab_capture_performance_tests') 165 test_type='tab_capture_performance_tests',
166 spawn_dbus=True)
165 167
166 # TODO(kbr): after the conversion to recipes, add all GPU related 168 # TODO(kbr): after the conversion to recipes, add all GPU related
167 # steps from the main waterfall, like gpu_unittests. 169 # steps from the main waterfall, like gpu_unittests.
168 170
169 def GenTests(api): 171 def GenTests(api):
170 for build_config in ['Release', 'Debug']: 172 for build_config in ['Release', 'Debug']:
171 for plat in ['win', 'mac', 'linux']: 173 for plat in ['win', 'mac', 'linux']:
172 # Normal builder configuration 174 # Normal builder configuration
173 base_name = '%s_%s' % (plat, build_config.lower()) 175 base_name = '%s_%s' % (plat, build_config.lower())
174 yield ( 176 yield (
(...skipping 26 matching lines...) Expand all
201 ) 203 )
202 204
203 # Test one trybot configuration with Blink issues. 205 # Test one trybot configuration with Blink issues.
204 yield ( 206 yield (
205 api.test('mac_release_tryserver_blink') + 207 api.test('mac_release_tryserver_blink') +
206 api.properties.tryserver( 208 api.properties.tryserver(
207 build_config='Release', 209 build_config='Release',
208 root='src/third_party/WebKit') + 210 root='src/third_party/WebKit') +
209 api.platform.name('mac') 211 api.platform.name('mac')
210 ) 212 )
OLDNEW
« no previous file with comments | « scripts/slave/recipe_modules/gpu/api.py ('k') | scripts/slave/recipes/gpu.expected/linux_debug.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698