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

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

Issue 339183013: De-duplicate steps between chromium and chromium_trybot recipes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
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 DEPS = [ 5 DEPS = [
6 'archive', 6 'archive',
7 'bot_update', 7 'bot_update',
8 'chromium', 8 'chromium',
9 'chromium_android', 9 'chromium_android',
10 'gclient', 10 'gclient',
11 'isolate', 11 'isolate',
12 'json', 12 'json',
13 'path', 13 'path',
14 'platform', 14 'platform',
15 'properties', 15 'properties',
16 'python', 16 'python',
17 'step_history', 17 'step_history',
18 'test_utils',
agable 2014/06/27 18:34:42 I find it to be an anti-pattern for this recipe to
Paweł Hajdan Jr. 2014/06/27 18:58:22 Suggestions how to change this are welcome. One wa
18 ] 19 ]
19 20
20 21
21 # Different types of builds this recipe can do. 22 # Different types of builds this recipe can do.
22 RECIPE_CONFIGS = { 23 RECIPE_CONFIGS = {
23 'chromeos_official': { 24 'chromeos_official': {
24 'chromium_config': 'chromium_official', 25 'chromium_config': 'chromium_official',
25 'chromium_apply_config': ['chromeos'], 26 'chromium_apply_config': ['chromeos'],
26 'gclient_config': 'chromium', 27 'gclient_config': 'chromium',
27 'gclient_apply_config': ['chrome_internal'], 28 'gclient_apply_config': ['chrome_internal'],
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 extra_url_components=api.properties['mastername'],), 212 extra_url_components=api.properties['mastername'],),
212 build_revision=got_revision, 213 build_revision=got_revision,
213 # TODO(phajdan.jr): Move abort_on_failure to archive recipe module. 214 # TODO(phajdan.jr): Move abort_on_failure to archive recipe module.
214 abort_on_failure=True)) 215 abort_on_failure=True))
215 216
216 if (api.chromium.c.TARGET_PLATFORM == 'android' and 217 if (api.chromium.c.TARGET_PLATFORM == 'android' and
217 bot_type in ['tester', 'builder_tester']): 218 bot_type in ['tester', 'builder_tester']):
218 steps.append(api.chromium_android.common_tests_setup_steps()) 219 steps.append(api.chromium_android.common_tests_setup_steps())
219 220
220 if not bot_config.get('do_not_run_tests'): 221 if not bot_config.get('do_not_run_tests'):
221 test_steps = [t.run(api) for t in bot_config.get('tests', [])] 222 test_steps = [t.run(api, '') for t in bot_config.get('tests', [])]
agable 2014/06/27 18:34:42 Why not have suffix='' as a default argument every
Paweł Hajdan Jr. 2014/06/27 18:58:22 I considered that, I somewhat prefer it to be expl
222 steps.extend(api.chromium.setup_tests(bot_type, test_steps)) 223 steps.extend(api.chromium.setup_tests(bot_type, test_steps))
223 224
224 if (api.chromium.c.TARGET_PLATFORM == 'android' and 225 if (api.chromium.c.TARGET_PLATFORM == 'android' and
225 bot_type in ['tester', 'builder_tester']): 226 bot_type in ['tester', 'builder_tester']):
226 steps.append(api.chromium_android.common_tests_final_steps()) 227 steps.append(api.chromium_android.common_tests_final_steps())
227 228
228 # For non-trybot recipes we should know (seed) all steps in advance, 229 # For non-trybot recipes we should know (seed) all steps in advance,
229 # at the beginning of each build. Instead of yielding single steps 230 # at the beginning of each build. Instead of yielding single steps
230 # or groups of steps, yield all of them at the end. 231 # or groups of steps, yield all of them at the end.
231 yield steps 232 yield steps
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 buildername='Chromium Linux MSan', 330 buildername='Chromium Linux MSan',
330 parent_buildername='Chromium Linux MSan Builder') + 331 parent_buildername='Chromium Linux MSan Builder') +
331 api.platform('linux', 64) + 332 api.platform('linux', 64) +
332 api.override_step_data('read test spec', api.json.output({ 333 api.override_step_data('read test spec', api.json.output({
333 'Chromium Linux MSan': { 334 'Chromium Linux MSan': {
334 'compile_targets': ['base_unittests'], 335 'compile_targets': ['base_unittests'],
335 'gtest_tests': ['base_unittests'], 336 'gtest_tests': ['base_unittests'],
336 }, 337 },
337 })) 338 }))
338 ) 339 )
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698