Roll swarm_client @ 162405.

third_party/cacheinvalidation/cacheinvalidation.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # This library should build cleanly with the extra warnings turned on
     # for Chromium.
     'chromium_code': 1,
     # The relative path of the cacheinvalidation proto files from 'src'.
@@ skipping 128 matching lines @@
       ],
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/base.gyp:run_all_unittests',
         '../../testing/gmock.gyp:gmock',
         '../../testing/gtest.gyp:gtest',
         'cacheinvalidation',
         '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': [
+          'target_name': 'cacheinvalidation_unittests_run',
+          'type': 'none',
+          'dependencies': [
+            'cacheinvalidation_unittests',
+          ],
+          'includes': [
             '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',
+          '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',
+              ],
+            },
           ],
         },
       ],
-    },
+    }],
   ],
 }