test_isolation_outdir must be considered an opaque string, it could be an url.

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

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=188057

[csharp, 2013-03-13 19:16:58]

https://codereview.chromium.org/12457024/diff/1/build/isolate.gypi
File build/isolate.gypi (right):

https://codereview.chromium.org/12457024/diff/1/build/isolate.gypi#newcode72
build/isolate.gypi:72: '--outdir', '<(test_isolation_outdir)',
Add back and change if to be == instead of !=

[M-A Ruel, 2013-03-13 19:20:01]

https://codereview.chromium.org/12457024/diff/4001/build/isolate.gypi
File build/isolate.gypi (right):

https://codereview.chromium.org/12457024/diff/4001/build/isolate.gypi#newcode59
build/isolate.gypi:59: ["test_isolation_outdir==''", {
changed to be more explicit.

[csharp, 2013-03-13 19:30:57]

lgtm

[commit-bot: I haz the power, 2013-03-14 12:54:52]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/maruel@chromium.org/12457024/4001

[commit-bot: I haz the power, 2013-03-14 12:54:53]

Failed to apply patch for build/isolate.gypi:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file build/isolate.gypi
  Hunk #1 FAILED at 55.
  1 out of 1 hunk FAILED -- saving rejects to file build/isolate.gypi.rej

Patch:       build/isolate.gypi
Index: build/isolate.gypi
diff --git a/build/isolate.gypi b/build/isolate.gypi
index
d7523fdfb389028747bca14cc61ceb2d82ca407b..2b80c42ac60ebf9e7bba84158b9c14c1c90d2362
100644
--- a/build/isolate.gypi
+++ b/build/isolate.gypi
@@ -55,21 +55,30 @@
       'outputs': [
         '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated',
       ],
-      'action': [
-        '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)',
-      ],
       '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)',
           ],
         }],
         ['test_isolation_fail_on_missing == 0', {

[M-A Ruel, 2013-03-14 13:01:44]

Modified the CL, ptal.

[csharp, 2013-03-14 13:44:14]

lgtm

[commit-bot: I haz the power, 2013-03-14 13:46:56]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/maruel@chromium.org/12457024/12001

[commit-bot: I haz the power, 2013-03-14 14:01:35]

Change committed as 188057