summaryrefslogtreecommitdiff
path: root/buildbot
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af>2012-02-23 21:18:54 +0000
committerscottmg@chromium.org <scottmg@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af>2012-02-23 21:18:54 +0000
commit880525d606ba0b4b185351e379c25d74fbc2d326 (patch)
tree1249136c448eaf03414ebace81c0a1c52a9e9e55 /buildbot
parentf2a88c8e4bac7567d81a8e18650bc176bcc6838f (diff)
downloadgyp-880525d606ba0b4b185351e379c25d74fbc2d326.tar.gz
- Make gyptest.py set up the environment in case cl/link/etc. aren't in the environment.
- Add ninja to Windows runs. Review URL: https://chromiumcodereview.appspot.com/9433026 git-svn-id: http://gyp.googlecode.com/svn/trunk@1236 78cadc50-ecff-11dd-a971-7dbc132099af
Diffstat (limited to 'buildbot')
-rwxr-xr-xbuildbot/buildbot_run.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/buildbot/buildbot_run.py b/buildbot/buildbot_run.py
index e0fda368..57fdb655 100755
--- a/buildbot/buildbot_run.py
+++ b/buildbot/buildbot_run.py
@@ -79,6 +79,7 @@ def GypBuild():
retcode += GypTestFormat('xcode')
retcode += GypTestFormat('make')
elif sys.platform == 'win32':
+ retcode += GypTestFormat('ninja')
retcode += GypTestFormat('msvs-2008', format='msvs', msvs_version='2008')
if os.environ['BUILDBOT_BUILDERNAME'] == 'gyp-win64':
retcode += GypTestFormat('msvs-2010', format='msvs', msvs_version='2010')