Switch the Linux bots on chromium.webkit to use Ninja.

masters/master.chromium.webkit/master_linux_gpu_latest_cfg.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 from master import master_config
 from master.factory import chromium_factory
 
 defaults = {}
 
@@ skipping 25 matching lines @@
   auto_reboot=False)
 F('f_gpu_linux_rel', linux().ChromiumWebkitLatestFactory(
     target='Release',
     tests=[
       'gl_tests',
       'gpu_frame_rate',
       'gpu_latency',
       'gpu_tests',
       'gpu_throughput',
     ],
-    options=['--compiler=goma', 'chromium_gpu_builder'],
+    options=[
+      '--build-tool=ninja',
+      '--compiler=goma',
+      'chromium_gpu_builder',

[iannucci, 2012/12/10 22:08:15]

Not to be pedantic, but I think we're trying to converge on a '--' between
options and build targets :)

[tony, 2012/12/10 22:15:17]

Ok, I've added '--' before any build targets.

+    ],
     factory_properties={
-        'generate_gtest_json': True,
-        'perf_id': 'gpu-webkit-linux-nvidia',
-        'show_perf_results': True,
+      'generate_gtest_json': True,
+      'perf_id': 'gpu-webkit-linux-nvidia',
+      'show_perf_results': True,
+      'gclient_env': { 'GYP_GENERATORS': 'ninja' },
     }))
 
 ################################################################################
 ## Debug
 ################################################################################
 
 #
 # Main debug scheduler for webkit
 #
 S('s9_gpu_linux_webkit_dbg', branch='trunk', treeStableTimer=60)
 
 B('GPU Linux (dbg) (NVIDIA)', 'f_gpu_linux_dbg',
   scheduler='s9_gpu_linux_webkit_dbg', auto_reboot=False)
 F('f_gpu_linux_dbg', linux().ChromiumWebkitLatestFactory(
     target='Debug',
     tests=[
       'gl_tests',
       'gpu_tests',
     ],
-    options=['--compiler=goma', 'chromium_gpu_debug_builder'],
-    factory_properties={'generate_gtest_json': True}))
+    options=[
+      '--build-tool=ninja',
+      '--compiler=goma',
+      'chromium_gpu_debug_builder'
+    ],
+    factory_properties={
+      'generate_gtest_json': True,
+      'gclient_env': { 'GYP_GENERATORS': 'ninja' },
+    }))
 
 
 def Update(config, active_master, c):
   return helper.Update(c)