diff options
| author | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-11 16:32:27 +0000 |
|---|---|---|
| committer | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-11 16:32:27 +0000 |
| commit | 2201708e3cb773d707bd92f496b61033650ca0fa (patch) | |
| tree | 064b808bade1248cf16f5f983bd7c02b2ce62b7b /build/isolate.gypi | |
| parent | 9986e8389dfbc9dc87183ef4c5ecc156d840bce1 (diff) | |
| download | chromium_src-2201708e3cb773d707bd92f496b61033650ca0fa.zip chromium_src-2201708e3cb773d707bd92f496b61033650ca0fa.tar.gz chromium_src-2201708e3cb773d707bd92f496b61033650ca0fa.tar.bz2 | |
When running isolate command through the build tools, have the relative out directories get the same root, so that they all refer to the same location.
BUG=
Review URL: https://chromiumcodereview.appspot.com/12398025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187305 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/isolate.gypi')
| -rw-r--r-- | build/isolate.gypi | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/build/isolate.gypi b/build/isolate.gypi index 0f0a163..6ddc3fe 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -60,16 +60,20 @@ 'python', '<(DEPTH)/tools/swarm_client/isolate.py', '<(test_isolation_mode)', - '--outdir', '<(test_isolation_outdir)', '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)', '--variable', 'OS', '<(OS)', '--variable', 'chromeos', '<(chromeos)', '--result', '<@(_outputs)', '--isolate', '<(RULE_INPUT_PATH)', - # Remove once mac compiles are fixed. - '-v', - '-v', ], + 'conditions': [ + ["test_isolation_outdir!=''", { + 'action': [ + '--outdir', '<(PRODUCT_DIR)/<(test_isolation_outdir)', + ], + }], + ], + 'msvs_cygwin_shell': 0, }, ], |