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

Side by Side Diff: masters/master.chromium.webkit/master_linux_webkit_pinned_cfg.py

Issue 11516008: Switch the Linux bots on chromium.webkit to use Ninja. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build/
Patch Set: Created 8 years 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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 master import master_config 5 from master import master_config
6 from master.factory import chromium_factory 6 from master.factory import chromium_factory
7 7
8 defaults = {} 8 defaults = {}
9 9
10 helper = master_config.Helper(defaults) 10 helper = master_config.Helper(defaults)
(...skipping 21 matching lines...) Expand all
32 # 32 #
33 B('WebKit Linux (deps)', 'f_webkit_linux_rel', scheduler='s3_chromium_rel') 33 B('WebKit Linux (deps)', 'f_webkit_linux_rel', scheduler='s3_chromium_rel')
34 F('f_webkit_linux_rel', linux().ChromiumFactory( 34 F('f_webkit_linux_rel', linux().ChromiumFactory(
35 tests=[ 35 tests=[
36 'test_shell', 36 'test_shell',
37 'webkit', 37 'webkit',
38 'webkit_lint', 38 'webkit_lint',
39 'webkit_unit', 39 'webkit_unit',
40 ], 40 ],
41 options=[ 41 options=[
42 '--build-tool=ninja',
42 '--compiler=goma', 43 '--compiler=goma',
43 'DumpRenderTree', 44 'DumpRenderTree',
44 'test_shell', 45 'test_shell',
45 'test_shell_tests', 46 'test_shell_tests',
46 'webkit_unit_tests', 47 'webkit_unit_tests',
47 ], 48 ],
48 factory_properties={ 49 factory_properties={
49 'additional_expectations_files': [ 50 'additional_expectations_files': [
50 ['webkit', 'tools', 'layout_tests', 'test_expectations.txt' ], 51 ['webkit', 'tools', 'layout_tests', 'test_expectations.txt' ],
51 ], 52 ],
52 'archive_webkit_results': True, 53 'archive_webkit_results': True,
53 'generate_gtest_json': True, 54 'generate_gtest_json': True,
54 'test_results_server': 'test-results.appspot.com' 55 'test_results_server': 'test-results.appspot.com',
56 'gclient_env': { 'GYP_GENERATORS': 'ninja' },
55 })) 57 }))
56 58
57 def Update(config, active_master, c): 59 def Update(config, active_master, c):
58 return helper.Update(c) 60 return helper.Update(c)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698