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

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

Issue 24878003: Build chromium_gpu_debug_builder target on debug bots. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Applied simplification suggested by iannucci@. Created 7 years, 2 months 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
« no previous file with comments | « no previous file | scripts/slave/recipes/gpu.expected/linux_debug.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 13 matching lines...) Expand all
24 'gl_tests' 24 'gl_tests'
25 ] 25 ]
26 26
27 def GenSteps(api): 27 def GenSteps(api):
28 # These values may be replaced by external configuration later 28 # These values may be replaced by external configuration later
29 dashboard_upload_url = 'https://chromeperf.appspot.com' 29 dashboard_upload_url = 'https://chromeperf.appspot.com'
30 generated_dir = api.path.slave_build('content_gpu_data', 'generated') 30 generated_dir = api.path.slave_build('content_gpu_data', 'generated')
31 reference_dir = api.path.slave_build('content_gpu_data', 'reference') 31 reference_dir = api.path.slave_build('content_gpu_data', 'reference')
32 gsutil = api.path.build('scripts', 'slave', 'gsutil', wrapper=True) 32 gsutil = api.path.build('scripts', 'slave', 'gsutil', wrapper=True)
33 33
34 is_release_build = api.properties.get('build_config', 'Release') == 'Release'
35
34 api.chromium.set_config('chromium') 36 api.chromium.set_config('chromium')
35 api.gclient.apply_config('chrome_internal') 37 api.gclient.apply_config('chrome_internal')
36 38
37 # Don't skip the frame_rate data, as it's needed for the frame rate tests. 39 # Don't skip the frame_rate data, as it's needed for the frame rate tests.
38 # Per iannucci@, it can be relied upon that solutions[1] is src-internal. 40 # Per iannucci@, it can be relied upon that solutions[1] is src-internal.
39 # Consider adding a 'gpu' module so that this can be managed in a 41 # Consider adding a 'gpu' module so that this can be managed in a
40 # 'gpu' config. 42 # 'gpu' config.
41 del api.gclient.c.solutions[1].custom_deps[ 43 del api.gclient.c.solutions[1].custom_deps[
42 'src/chrome/test/data/perf/frame_rate/private'] 44 'src/chrome/test/data/perf/frame_rate/private']
43 45
44 api.chromium.c.gyp_env.GYP_DEFINES['internal_gles2_conform_tests'] = 1 46 api.chromium.c.gyp_env.GYP_DEFINES['internal_gles2_conform_tests'] = 1
45 47
46 # If you want to stub out the checkout/runhooks/compile steps, 48 # If you want to stub out the checkout/runhooks/compile steps,
47 # uncomment this line and then comment out the associated block of 49 # uncomment this line and then comment out the associated block of
48 # yield statements below. 50 # yield statements below.
49 # api.path.add_checkout(api.path.slave_build('src')) 51 # api.path.add_checkout(api.path.slave_build('src'))
50 52
51 yield api.gclient.checkout() 53 yield api.gclient.checkout()
52 # If being run as a try server, apply the CL. 54 # If being run as a try server, apply the CL.
53 if 'rietveld' in api.properties: 55 if 'rietveld' in api.properties:
54 yield api.rietveld.apply_issue() 56 yield api.rietveld.apply_issue()
55 yield api.chromium.runhooks() 57 yield api.chromium.runhooks()
56 yield api.chromium.compile(targets=['chromium_gpu_builder']) 58 # Since performance tests aren't run on the debug builders, it isn't
59 # necessary to build all of the targets there.
60 build_tag = '' if is_release_build else 'debug_'
61 yield api.chromium.compile(targets=['chromium_gpu_%sbuilder' % build_tag])
57 62
58 # TODO(kbr): currently some properties are passed to runtest.py via 63 # TODO(kbr): currently some properties are passed to runtest.py via
59 # factory_properties in the master.cfg: generate_gtest_json, 64 # factory_properties in the master.cfg: generate_gtest_json,
60 # show_perf_results, test_results_server, and perf_id. runtest.py 65 # show_perf_results, test_results_server, and perf_id. runtest.py
61 # should be modified to take these arguments on the command line, 66 # should be modified to take these arguments on the command line,
62 # and the setting of these properties should happen in this recipe 67 # and the setting of these properties should happen in this recipe
63 # instead. 68 # instead.
64 69
65 # Note: --no-xvfb is the default. 70 # Note: --no-xvfb is the default.
66 for test in SIMPLE_TESTS_TO_RUN: 71 for test in SIMPLE_TESTS_TO_RUN:
(...skipping 22 matching lines...) Expand all
89 '%s_%s' % (api.properties['revision'], api.properties['buildername']), 94 '%s_%s' % (api.properties['revision'], api.properties['buildername']),
90 '--generated-dir', generated_dir, 95 '--generated-dir', generated_dir,
91 '--gpu-reference-dir', reference_dir, 96 '--gpu-reference-dir', reference_dir,
92 '--gsutil', gsutil] 97 '--gsutil', gsutil]
93 yield api.python('archive_test_results', 98 yield api.python('archive_test_results',
94 api.path.build('scripts', 'slave', 'chromium', \ 99 api.path.build('scripts', 'slave', 'chromium', \
95 'archive_gpu_pixel_test_results.py'), 100 'archive_gpu_pixel_test_results.py'),
96 args, always_run=True) 101 args, always_run=True)
97 102
98 # Only run the performance tests on Release builds. 103 # Only run the performance tests on Release builds.
99 if api.properties.get('build_config', 'Release') == 'Release': 104 if is_release_build:
100 # Former gpu_frame_rate_test step 105 # Former gpu_frame_rate_test step
101 args = ['--enable-gpu', 106 args = ['--enable-gpu',
102 '--gtest_filter=FrameRate*Test*'] 107 '--gtest_filter=FrameRate*Test*']
103 yield api.chromium.runtests('performance_ui_tests', 108 yield api.chromium.runtests('performance_ui_tests',
104 args, 109 args,
105 name='gpu_frame_rate_test', 110 name='gpu_frame_rate_test',
106 annotate='framerate', 111 annotate='framerate',
107 results_url=dashboard_upload_url, 112 results_url=dashboard_upload_url,
108 perf_dashboard_id='gpu_frame_rate', 113 perf_dashboard_id='gpu_frame_rate',
109 test_type='gpu_frame_rate_test') 114 test_type='gpu_frame_rate_test')
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 api.properties.scheduled(build_config=build_config) + 150 api.properties.scheduled(build_config=build_config) +
146 api.platform.name(plat) 151 api.platform.name(plat)
147 ) 152 )
148 153
149 # Try server configuration 154 # Try server configuration
150 yield ( 155 yield (
151 api.test('%s_tryserver' % base_name) + 156 api.test('%s_tryserver' % base_name) +
152 api.properties.tryserver(build_config=build_config) + 157 api.properties.tryserver(build_config=build_config) +
153 api.platform.name(plat) 158 api.platform.name(plat)
154 ) 159 )
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipes/gpu.expected/linux_debug.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698