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

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

Issue 1003453002: Do not pass use_prebuilt_mojo_shell to gn. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build@master
Patch Set: Rename 'Run apptests' to 'app_tests'. Created 5 years, 9 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 infra.libs.infra_types import freeze 5 from infra.libs.infra_types import freeze
6 6
7 DEPS = [ 7 DEPS = [
8 'bot_update', 8 'bot_update',
9 'chromium', 9 'chromium',
10 'path', 10 'path',
11 'python', 11 'python',
12 ] 12 ]
13 13
14 14
15 BUILDERS = freeze({ 15 BUILDERS = freeze({
16 'chromium.mojo': { 16 'chromium.mojo': {
17 'builders': { 17 'builders': {
18 'Chromium Mojo Linux': { 18 'Chromium Mojo Linux': {
19 'chromium_apply_config': ['gn_use_prebuilt_mojo_shell'],
20 'chromium_config_kwargs': { 19 'chromium_config_kwargs': {
21 'BUILD_CONFIG': 'Release', 20 'BUILD_CONFIG': 'Release',
22 'TARGET_PLATFORM': 'linux', 21 'TARGET_PLATFORM': 'linux',
23 }, 22 },
24 }, 23 },
25 }, 24 },
26 }, 25 },
27 }) 26 })
28 27
29 def _RunApptests(api): 28 def _RunApptests(api):
30 apptest_runner = api.path['checkout'].join('mojo', 'tools', 29 apptest_runner = api.path['checkout'].join('mojo', 'tools',
31 'apptest_runner.py') 30 'apptest_runner.py')
32 apptest_config = api.path['checkout'].join('mojo', 'tools', 31 apptest_config = api.path['checkout'].join('mojo', 'tools',
33 'data', 'apptests') 32 'data', 'apptests')
34 api.python('run apptests', apptest_runner, 33 api.python('app_tests', apptest_runner,
35 [apptest_config, api.chromium.output_dir]) 34 [apptest_config, api.chromium.output_dir])
36 35
37 36
38 def GenSteps(api): 37 def GenSteps(api):
39 _, bot_config = api.chromium.configure_bot(BUILDERS, ['gn']) 38 _, bot_config = api.chromium.configure_bot(BUILDERS, ['gn'])
40 39
41 api.bot_update.ensure_checkout(force=True, 40 api.bot_update.ensure_checkout(force=True,
42 patch_root=bot_config.get('root_override')) 41 patch_root=bot_config.get('root_override'))
43 42
44 api.chromium.runhooks() 43 api.chromium.runhooks()
45 44
46 api.chromium.run_gn(use_goma=True) 45 api.chromium.run_gn(use_goma=True)
47 46
48 api.chromium.compile(targets=['html_viewer_unittests', 47 api.chromium.compile(targets=['html_viewer_unittests',
49 'mojo/services/network', 48 'mojo/services/network',
50 'mojo/services/network:apptests']) 49 'mojo/services/network:apptests'])
51 50
52 api.chromium.runtest('html_viewer_unittests') 51 api.chromium.runtest('html_viewer_unittests')
53 52
54 _RunApptests(api) 53 _RunApptests(api)
55 54
56 55
57 def GenTests(api): 56 def GenTests(api):
58 for test in api.chromium.gen_tests_for_builders(BUILDERS): 57 for test in api.chromium.gen_tests_for_builders(BUILDERS):
59 yield test 58 yield test
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698