Add msvs version option to gyptest.

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 64 matching lines @@
   ALL = '__all__'
   DEFAULT = '__default__'
 
   # Constants for different target types.
   EXECUTABLE = '__executable__'
   STATIC_LIB = '__static_lib__'
   SHARED_LIB = '__shared_lib__'
 
   def __init__(self, gyp=None, *args, **kw):
     self.origin_cwd = os.path.abspath(os.path.dirname(sys.argv[0]))
+    self.extra_args = sys.argv[1:]
 
     if not gyp:
       gyp = os.environ.get('TESTGYP_GYP')
       if not gyp:
         if sys.platform == 'win32':
           gyp = 'gyp.bat'
         else:
           gyp = 'gyp'
     self.gyp = os.path.abspath(gyp)
 
@@ skipping 142 matching lines @@
     Runs gyp against the specified gyp_file with the specified args.
     """
 
     # When running gyp, and comparing its output we use a comparitor
     # that ignores the line numbers that gyp logs in its debug output.
     if kw.pop('ignore_line_numbers', False):
       kw.setdefault('match', match_modulo_line_numbers)
 
     # TODO:  --depth=. works around Chromium-specific tree climbing.
     depth = kw.pop('depth', '.')
-    args = ('--depth='+depth, '--format='+self.format, gyp_file) + args
-    return self.run(program=self.gyp, arguments=args, **kw)
+    run_args = ['--depth='+depth, '--format='+self.format, gyp_file]
+    run_args.extend(self.extra_args)
+    run_args.extend(args)
+    return self.run(program=self.gyp, arguments=run_args, **kw)
 
   def run(self, *args, **kw):
     """
     Executes a program by calling the superclass .run() method.
 
     This exists to provide a common place to filter out keyword
     arguments implemented in this layer, without having to update
     the tool-specific subclasses or clutter the tests themselves
     with platform-specific code.
     """
@@ skipping 349 matching lines @@
   We use the value specified by GYP_MSVS_VERSION.  If not specified, we
   search %PATH% and %PATHEXT% for a devenv.{exe,bat,...} executable.
   Failing that, we search for likely deployment paths.
   """
   possible_roots = ['C:\\Program Files (x86)', 'C:\\Program Files',
                     'E:\\Program Files (x86)', 'E:\\Program Files']
   possible_paths = {
       '2010': r'Microsoft Visual Studio 10.0\Common7\IDE\devenv.com',
       '2008': r'Microsoft Visual Studio 9.0\Common7\IDE\devenv.com',
       '2005': r'Microsoft Visual Studio 8\Common7\IDE\devenv.com'}
-  msvs_version = os.environ.get('GYP_MSVS_VERSION', 'auto')
+
+  msvs_version = 'auto'
+  for flag in (f for f in sys.argv if f.startswith('msvs_version=')):
+    msvs_version = flag.split('=')[-1]
+  msvs_version = os.environ.get('GYP_MSVS_VERSION', msvs_version)
+
   build_tool = None
   if msvs_version in possible_paths:
     # Check that the path to the specified GYP_MSVS_VERSION exists.
     path = possible_paths[msvs_version]
     for r in possible_roots:
       bt = os.path.join(r, path)
       if os.path.exists(bt):
         build_tool = bt
         uses_msbuild = msvs_version >= '2010'
         return build_tool, uses_msbuild
@@ skipping 393 matching lines @@
 
 def TestGyp(*args, **kw):
   """
   Returns an appropriate TestGyp* instance for a specified GYP format.
   """
   format = kw.pop('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