diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-14 14:01:33 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-14 14:01:33 +0000 |
| commit | fd09cbdee7d90e68367fcf84ca6baff59aec82e9 (patch) | |
| tree | 725f36f457b8df301a63945232ec244cf89d4500 /build/isolate.gypi | |
| parent | 465bb4185c8b843d8d6009a5bcf4d80735995314 (diff) | |
| download | chromium_src-fd09cbdee7d90e68367fcf84ca6baff59aec82e9.zip chromium_src-fd09cbdee7d90e68367fcf84ca6baff59aec82e9.tar.gz chromium_src-fd09cbdee7d90e68367fcf84ca6baff59aec82e9.tar.bz2 | |
test_isolation_outdir must be considered an opaque string, it could be an url.
Remove RULE_INPUT_PATH from the list of inputs, it was an error.
R=csharp@chromium.org
BUG=
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/12457024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188057 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/isolate.gypi')
| -rw-r--r-- | build/isolate.gypi | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/build/isolate.gypi b/build/isolate.gypi index 6ddc3fe..d57dc49 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -40,7 +40,6 @@ 'rule_name': 'isolate', 'extension': 'isolate', 'inputs': [ - '<(RULE_INPUT_PATH)', # Disable file tracking by the build driver for now. This means the # project must have the proper build-time dependency for their runtime # dependency. This improves the runtime of the build driver since it @@ -56,20 +55,30 @@ 'outputs': [ '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated', ], - 'action': [ - 'python', - '<(DEPTH)/tools/swarm_client/isolate.py', - '<(test_isolation_mode)', - '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)', - '--variable', 'OS', '<(OS)', - '--variable', 'chromeos', '<(chromeos)', - '--result', '<@(_outputs)', - '--isolate', '<(RULE_INPUT_PATH)', - ], 'conditions': [ - ["test_isolation_outdir!=''", { + ["test_isolation_outdir==''", { + 'action': [ + 'python', + '<(DEPTH)/tools/swarm_client/isolate.py', + '<(test_isolation_mode)', + '--outdir', '<(PRODUCT_DIR)', + '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)', + '--variable', 'OS', '<(OS)', + '--variable', 'chromeos', '<(chromeos)', + '--result', '<@(_outputs)', + '--isolate', '<(RULE_INPUT_PATH)', + ], + }, { 'action': [ - '--outdir', '<(PRODUCT_DIR)/<(test_isolation_outdir)', + '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)', ], }], ], |