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

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

Issue 1588793002: Support variable substitution and tryserver- and waterfall-only cmd line args. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Addressed review feedback. Revised tests. Rebased. Created 4 years, 11 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
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 recipe_engine.types import freeze 5 from recipe_engine.types import freeze
6 6
7 DEPS = [ 7 DEPS = [
8 'bot_update', 8 'bot_update',
9 'chromium', 9 'chromium',
10 'chromium_tests', 10 'chromium_tests',
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 # the runhooks step. 127 # the runhooks step.
128 api.chromium.runhooks() 128 api.chromium.runhooks()
129 129
130 # TODO(dpranke): Unify this with the logic in the chromium_trybot and 130 # TODO(dpranke): Unify this with the logic in the chromium_trybot and
131 # chromium recipes so that we can actually run the tests as well 131 # chromium recipes so that we can actually run the tests as well
132 # and deapply patches and retry as need be. 132 # and deapply patches and retry as need be.
133 test_spec_file = '%s.json' % mastername 133 test_spec_file = '%s.json' % mastername
134 test_spec = api.chromium_tests.read_test_spec(api, test_spec_file) 134 test_spec = api.chromium_tests.read_test_spec(api, test_spec_file)
135 135
136 tests = list(api.chromium_tests.steps.generate_gtest( 136 tests = list(api.chromium_tests.steps.generate_gtest(
137 api, mastername, buildername, test_spec)) 137 api, api.chromium_tests, mastername, buildername, test_spec,
138 bot_update_step))
138 139
139 scripts_compile_targets = \ 140 scripts_compile_targets = \
140 api.chromium_tests.get_compile_targets_for_scripts().json.output 141 api.chromium_tests.get_compile_targets_for_scripts().json.output
141 tests += list(api.chromium_tests.steps.generate_script( 142 tests += list(api.chromium_tests.steps.generate_script(
142 api, mastername, buildername, test_spec, 143 api, api.chromium_tests, mastername, buildername, test_spec,
143 scripts_compile_targets=scripts_compile_targets)) 144 bot_update_step, scripts_compile_targets=scripts_compile_targets))
144 145
145 additional_compile_targets = test_spec.get(buildername, {}).get( 146 additional_compile_targets = test_spec.get(buildername, {}).get(
146 'additional_compile_targets', 147 'additional_compile_targets',
147 ['chrome_public_apk' if is_android else 'all']) 148 ['chrome_public_apk' if is_android else 'all'])
148 149
149 if api.tryserver.is_tryserver: 150 if api.tryserver.is_tryserver:
150 affected_files = api.tryserver.get_files_affected_by_patch() 151 affected_files = api.tryserver.get_files_affected_by_patch()
151 152
152 test_targets = all_compile_targets(api, tests) 153 test_targets = all_compile_targets(api, tests)
153 154
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 'gtest_tests': ['base_unittests'], 257 'gtest_tests': ['base_unittests'],
257 }})) + 258 }})) +
258 api.override_step_data( 259 api.override_step_data(
259 'analyze', 260 'analyze',
260 api.json.output({ 261 api.json.output({
261 'status': 'Found dependency', 262 'status': 'Found dependency',
262 'test_targets': ['net_unittests'], 263 'test_targets': ['net_unittests'],
263 'compile_targets': ['net_unittests'], 264 'compile_targets': ['net_unittests'],
264 })) 265 }))
265 ) 266 )
OLDNEW
« no previous file with comments | « scripts/slave/recipes/chromium.expected/dynamic_isolated_script_test.json ('k') | scripts/slave/recipes/chromium_trybot.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698