diff options
| author | bungeman@chromium.org <bungeman@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> | 2014-06-04 16:07:15 +0000 |
|---|---|---|
| committer | bungeman@chromium.org <bungeman@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> | 2014-06-04 16:07:15 +0000 |
| commit | 11e243c9fd625728c086c264d5ca85cc786ddf82 (patch) | |
| tree | b9e3d3d275b2f565d8a8291f600380eefd0e31bd /buildbot | |
| parent | fb36c3fe0124493d0f54c7ac1e03870a6da0c715 (diff) | |
| download | gyp-11e243c9fd625728c086c264d5ca85cc786ddf82.tar.gz | |
Fix msvs-ninja OutputDirectory path.
_FixPath is designed to take gyp paths and convert them to msvs project paths.
This translates a <gyp_dir>"<gyp_dir_to_X>" to
<msvs_project_dir>"<msvs_project_dir_to_gyp_dir>/<gyp_dir_to_X>".
The OutputDirectory when using ninja as the external builder with the ninja
generator generated build files needs to be the path
<msvs_project_dir>"<msvs_project_dir_to_ninja_build_config>".
Since this is specified on a per target basis and will be run though _FixPath,
the external builder directory in the target must be specified as
<gyp_dir>"<gyp_dir_to_toplevel_dir>/<toplevel_dir_to_ninja_build>/<config>".
Chromium currently does not see any issue as it does not set generator_output.
When generator_output is not set, _GetPathOfProject sets fix_prefix to None.
Also, Chromium appears to be using an absolute path for
msvs_external_builder_out_dir.
This is, however, affecting Skia, which sets generator_output to 'out' and
places all of its gyp files in a 'gyp' directory. As a result Skia is seeing
the OutputDirectory set to "../../gyp/out/$(Configuration)". This change fixes
this to "../../out/$(Configuration)".
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/245923003
git-svn-id: http://gyp.googlecode.com/svn/trunk@1926 78cadc50-ecff-11dd-a971-7dbc132099af
Diffstat (limited to 'buildbot')
| -rwxr-xr-x | buildbot/buildbot_run.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/buildbot/buildbot_run.py b/buildbot/buildbot_run.py index 979073c7..cc3a25ae 100755 --- a/buildbot/buildbot_run.py +++ b/buildbot/buildbot_run.py @@ -107,7 +107,7 @@ def PrepareAndroidTree(): 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: @@ -131,7 +131,7 @@ def GypTestFormat(title, format=None, msvs_version=None): '--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. @@ -173,6 +173,12 @@ def GypBuild(): 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: |