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

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: fixes 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',
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 extra_url_components=api.properties['mastername'],), 212 extra_url_components=api.properties['mastername'],),
213 build_revision=got_revision, 213 build_revision=got_revision,
214 # TODO(phajdan.jr): Move abort_on_failure to archive recipe module. 214 # TODO(phajdan.jr): Move abort_on_failure to archive recipe module.
215 abort_on_failure=True)) 215 abort_on_failure=True))
216 216
217 if (api.chromium.c.TARGET_PLATFORM == 'android' and 217 if (api.chromium.c.TARGET_PLATFORM == 'android' and
218 bot_type in ['tester', 'builder_tester']): 218 bot_type in ['tester', 'builder_tester']):
219 steps.append(api.chromium_android.common_tests_setup_steps()) 219 steps.append(api.chromium_android.common_tests_setup_steps())
220 220
221 if not bot_config.get('do_not_run_tests'): 221 if not bot_config.get('do_not_run_tests'):
222 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', [])]
223 steps.extend(api.chromium.setup_tests(bot_type, test_steps)) 223 steps.extend(api.chromium.setup_tests(bot_type, test_steps))
224 224
225 if (api.chromium.c.TARGET_PLATFORM == 'android' and 225 if (api.chromium.c.TARGET_PLATFORM == 'android' and
226 bot_type in ['tester', 'builder_tester']): 226 bot_type in ['tester', 'builder_tester']):
227 steps.append(api.chromium_android.common_tests_final_steps()) 227 steps.append(api.chromium_android.common_tests_final_steps())
228 228
229 # 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,
230 # at the beginning of each build. Instead of yielding single steps 230 # at the beginning of each build. Instead of yielding single steps
231 # or groups of steps, yield all of them at the end. 231 # or groups of steps, yield all of them at the end.
232 yield steps 232 yield steps
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 buildername='Chromium Linux MSan', 330 buildername='Chromium Linux MSan',
331 parent_buildername='Chromium Linux MSan Builder') + 331 parent_buildername='Chromium Linux MSan Builder') +
332 api.platform('linux', 64) + 332 api.platform('linux', 64) +
333 api.override_step_data('read test spec', api.json.output({ 333 api.override_step_data('read test spec', api.json.output({
334 'Chromium Linux MSan': { 334 'Chromium Linux MSan': {
335 'compile_targets': ['base_unittests'], 335 'compile_targets': ['base_unittests'],
336 'gtest_tests': ['base_unittests'], 336 'gtest_tests': ['base_unittests'],
337 }, 337 },
338 })) 338 }))
339 ) 339 )
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698