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

Unified Diff: masters/master.chromium.webkit/master_linux_webkit_latest_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 side-by-side diff with in-line comments
Download patch
Index: masters/master.chromium.webkit/master_linux_webkit_latest_cfg.py
===================================================================
--- masters/master.chromium.webkit/master_linux_webkit_latest_cfg.py (revision 172130)
+++ masters/master.chromium.webkit/master_linux_webkit_latest_cfg.py (working copy)
@@ -38,15 +38,19 @@
'webkit_unit',
],
options=[
+ '--build-tool=ninja',
'--compiler=goma',
'DumpRenderTree',
'test_shell',
'test_shell_tests',
'webkit_unit_tests',
],
- factory_properties={'archive_webkit_results': True,
- 'generate_gtest_json': True,
- 'test_results_server': 'test-results.appspot.com'}))
+ factory_properties={
+ 'archive_webkit_results': True,
+ 'generate_gtest_json': True,
+ 'test_results_server': 'test-results.appspot.com',
+ 'gclient_env': { 'GYP_GENERATORS': 'ninja' },
+ }))
B('WebKit Linux 32', 'f_webkit_linux_rel', scheduler='s6_webkit_rel')
@@ -57,14 +61,19 @@
auto_reboot=False)
F('f_webkit_linux_rel_asan', linux().ChromiumWebkitLatestFactory(
tests=['webkit'],
- options=['--compiler=goma-clang', 'DumpRenderTree'],
+ options=[
+ '--build-tool=ninja',
+ '--compiler=goma-clang',
+ 'DumpRenderTree'
+ ],
factory_properties={
- 'additional_expectations_files': [
- ['webkit', 'tools', 'layout_tests', 'test_expectations_asan.txt' ],
- ],
- 'gs_bucket': 'gs://webkit-asan',
- 'gclient_env': {'GYP_DEFINES': asan_gyp},
- 'time_out_ms': '18000'}))
+ 'additional_expectations_files': [
+ ['webkit', 'tools', 'layout_tests', 'test_expectations_asan.txt' ],
+ ],
+ 'gs_bucket': 'gs://webkit-asan',
+ 'gclient_env': {'GYP_DEFINES': asan_gyp, 'GYP_GENERATORS': 'ninja'},
+ 'time_out_ms': '18000'
+ }))
################################################################################
@@ -91,15 +100,19 @@
'webkit_unit',
],
options=[
+ '--build-tool=ninja',
'--compiler=goma',
'test_shell',
'test_shell_tests',
'webkit_unit_tests',
'DumpRenderTree',
],
- factory_properties={'archive_webkit_results': True,
- 'generate_gtest_json': True,
- 'test_results_server': 'test-results.appspot.com'}))
+ factory_properties={
+ 'archive_webkit_results': True,
+ 'generate_gtest_json': True,
+ 'test_results_server': 'test-results.appspot.com',
+ 'gclient_env': { 'GYP_GENERATORS': 'ninja' },
+ }))
def Update(config, active_master, c):
return helper.Update(c)

Powered by Google App Engine
This is Rietveld 408576698