Fix msvs-ninja OutputDirectory path.

buildbot/buildbot_run.py

 #!/usr/bin/env python
 # 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.
 
 
 """Argument-less script to select what to run on the buildbots."""
 
 
 import os
@@ skipping 89 matching lines @@
   print '@@@BUILD_STEP Sync Android@@@'
   CallSubProcess(['repo', 'sync', '-j4'], cwd=ANDROID_DIR)
 
   print '@@@BUILD_STEP Build Android@@@'
   CallSubProcess(
       ['/bin/bash',
        '-c', 'source build/envsetup.sh && lunch full-eng && make -j4'],
       cwd=ANDROID_DIR)
 
 
-def GypTestFormat(title, format=None, msvs_version=None):
+def GypTestFormat(title, format=None, msvs_version=None, tests=[]):
   """Run the gyp tests for a given format, emitting annotator tags.
 
   See annotator docs at:
     https://sites.google.com/a/chromium.org/dev/developers/testing/chromium-build-infrastructure/buildbot-annotations
   Args:
     format: gyp format to test.
   Returns:
     0 for sucesss, 1 for failure.
   """
   if not format:
     format = title
 
   print '@@@BUILD_STEP ' + title + '@@@'
   sys.stdout.flush()
   env = os.environ.copy()
   if msvs_version:
     env['GYP_MSVS_VERSION'] = msvs_version
   command = ' '.join(
       [sys.executable, 'trunk/gyptest.py',
        '--all',
        '--passed',
        '--format', format,
        '--path', CMAKE_BIN_DIR,
-       '--chdir', 'trunk'])
+       '--chdir', 'trunk'] + tests)
   if format == 'android':
     # gyptest needs the environment setup from envsetup/lunch in order to build
     # using the 'android' backend, so this is done in a single shell.
     retcode = subprocess.call(
         ['/bin/bash',
          '-c', 'source build/envsetup.sh && lunch full-eng && cd %s && %s'
          % (ROOT_DIR, command)],
         cwd=ANDROID_DIR, env=env)
   else:
     retcode = subprocess.call(command, cwd=ROOT_DIR, env=env, shell=True)
@@ skipping 21 matching lines @@
     retcode += GypTestFormat('make')
     PrepareCmake()
     retcode += GypTestFormat('cmake')
   elif sys.platform == 'darwin':
     retcode += GypTestFormat('ninja')
     retcode += GypTestFormat('xcode')
     retcode += GypTestFormat('make')
   elif sys.platform == 'win32':
     retcode += GypTestFormat('ninja')
     if os.environ['BUILDBOT_BUILDERNAME'] == 'gyp-win64':
+      retcode += GypTestFormat('msvs-ninja-2012', format='msvs-ninja',
+                               msvs_version='2012',
+                               tests=[
+                                   'test\generator-output\gyptest-actions.py',
+                                   'test\generator-output\gyptest-relocate.py',
+                                   'test\generator-output\gyptest-rules.py'])
       retcode += GypTestFormat('msvs-2010', format='msvs', msvs_version='2010')
       retcode += GypTestFormat('msvs-2012', format='msvs', msvs_version='2012')
   else:
     raise Exception('Unknown platform')
   if retcode:
     # TODO(bradnelson): once the annotator supports a postscript (section for
     #     after the build proper that could be used for cumulative failures),
     #     use that instead of this. This isolates the final return value so
     #     that it isn't misattributed to the last stage.
     print '@@@BUILD_STEP failures@@@'
     sys.exit(retcode)
 
 
 if __name__ == '__main__':
   GypBuild()