Roll swarm_client @ 162405.

Since it's removing support for 'isolate.py noop', there's a small
chance that the it breaks gyp parsing.

TBR=csharp@chromium.org
BUG=


Review URL: https://chromiumcodereview.appspot.com/11191027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162475 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 33 insertions, 27 deletions

diff --git a/third_party/cacheinvalidation/README.chromium b/third_party/cacheinvalidation/README.chromium
index ad5d645..3508f1e 100644
--- a/third_party/cacheinvalidation/README.chromium
+++ b/third_party/cacheinvalidation/README.chromium
@@ -10,4 +10,4 @@ Description:
 This is the API to talk to the Google Cache Invalidation service.
 
 Local Modifications:
-None.
+None
diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp
index 0f1aac5..2271a38 100644
--- a/third_party/cacheinvalidation/cacheinvalidation.gyp
+++ b/third_party/cacheinvalidation/cacheinvalidation.gyp
@@ -146,37 +146,43 @@
         'cacheinvalidation_proto_cpp',
       ],
     },
-    {
-      'target_name': 'cacheinvalidation_unittests_run',
-      'type': 'none',
-      'dependencies': [
-        'cacheinvalidation_unittests',
-      ],
-      'includes': [
-        'cacheinvalidation_unittests.isolate',
-      ],
-      'actions': [
+  ],
+  'conditions': [
+    ['test_isolation_mode != "noop"', {
+      'targets': [
         {
-          'action_name': 'isolate',
-          'inputs': [
-            'cacheinvalidation_unittests.isolate',
-            '<@(isolate_dependency_tracked)',
+          'target_name': 'cacheinvalidation_unittests_run',
+          'type': 'none',
+          'dependencies': [
+            'cacheinvalidation_unittests',
           ],
-          'outputs': [
-            '<(PRODUCT_DIR)/cacheinvalidation_unittests.isolated',
+          'includes': [
+            'cacheinvalidation_unittests.isolate',
           ],
-          'action': [
-            'python',
-            '../../tools/swarm_client/isolate.py',
-            '<(test_isolation_mode)',
-            '--outdir', '<(test_isolation_outdir)',
-            '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
-            '--variable', 'OS', '<(OS)',
-            '--result', '<@(_outputs)',
-            '--isolate', 'cacheinvalidation_unittests.isolate',
+          'actions': [
+            {
+              'action_name': 'isolate',
+              'inputs': [
+                'cacheinvalidation_unittests.isolate',
+                '<@(isolate_dependency_tracked)',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/cacheinvalidation_unittests.isolated',
+              ],
+              'action': [
+                'python',
+                '../../tools/swarm_client/isolate.py',
+                '<(test_isolation_mode)',
+                '--outdir', '<(test_isolation_outdir)',
+                '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
+                '--variable', 'OS', '<(OS)',
+                '--result', '<@(_outputs)',
+                '--isolate', 'cacheinvalidation_unittests.isolate',
+              ],
+            },
           ],
         },
       ],
-    },
+    }],
   ],
 }