Add Windows ninja to buildbot

test/lib/TestGyp.py

 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 TestGyp.py:  a testing framework for GYP integration tests.
 """
 
 import os
 import re
@@ skipping 401 matching lines @@
 
 class TestGypNinja(TestGypBase):
   """
   Subclass for testing the GYP Ninja generator.
   """
   format = 'ninja'
   build_tool_list = ['ninja']
   ALL = 'all'
   DEFAULT = 'all'
 
+  def initialize_build_tool(self):
+    super(TestGypNinja, self).initialize_build_tool()
+    if sys.platform == 'win32':
+      # Compiler and linker aren't in the path by default on Windows, so we
+      # make our "build tool" be set up + run ninja.

[Nico, 2012/02/22 05:17:58]

Could you share code with TestGypMSVS.initialize_build_tool() here?

[scottmg, 2012/02/22 05:59:09]

Yeah... That code seems kinda busted but I was too scared (lazy) to refactor &
fix it. I'll suck it up. :)

+      vspath = 'Microsoft Visual Studio 9.0\\Common7\\Tools\\vsvars32.bat'
+      msvs_version = os.environ.get('GYP_MSVS_VERSION')
+      if msvs_version == '2010':
+        vspath = 'Microsoft Visual Studio 10.0\\Common7\\Tools\\vsvars32.bat'
+      path_root = os.environ.get('PROGRAMFILES')
+      full_path = os.path.join(path_root, vspath)
+      if os.path.exists(full_path):
+        self.build_tool = os.environ.get('COMSPEC', 'cmd.exe')
+        self.helper_args = ['/c', full_path, '&&', 'ninja']
+      else:
+        # Couldn't find setup, try just running default build_tool anyway.
+        self.helper_args = []
+
   def run_gyp(self, gyp_file, *args, **kw):
     TestGypBase.run_gyp(self, gyp_file, *args, **kw)
 
   def build(self, gyp_file, target=None, **kw):
     arguments = kw.get('arguments', [])[:]
 
     # Add a -C output/path to the command line.
     arguments.append('-C')
     arguments.append(os.path.join('out', self.configuration_dirname()))
 
     if target is None:
       target = 'all'
     arguments.append(target)
 
+    if sys.platform == 'win32':
+      arguments = self.helper_args + arguments
+
     kw['arguments'] = arguments
     return self.run(program=self.build_tool, **kw)
 
   def run_built_executable(self, name, *args, **kw):
     # Enclosing the name in a list avoids prepending the original dir.
     program = [self.built_file_path(name, type=self.EXECUTABLE, **kw)]
     if sys.platform == 'darwin':
       libdir = os.path.join('out', 'Default')
       if self.configuration:
         libdir = os.path.join('out', self.configuration)
@@ skipping 353 matching lines @@
   """
   format = kw.get('format')
   if format:
     del kw['format']
   else:
     format = os.environ.get('TESTGYP_FORMAT')
   for format_class in format_class_list:
     if format == format_class.format:
       return format_class(*args, **kw)
   raise Exception, "unknown format %r" % format