Remove target chromium_swarm_tests when test_isolate_mode == noop.

This is the default value. It can be overridden with GYP_DEFINES. It is with
the swarm master.
Also remove the corresponding XXX_run targets. These can be problematic when
developers are moving files around, especially with DEPS rolls.
This simplifies build slave management during the deployment as the .isolate
files are being rolled out.

TBR=cmp@chromium.org
NOTRY=true
BUG=139426

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

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

1 files changed, 36 insertions, 39 deletions

diff --git a/net/net.gyp b/net/net.gyp
index f8de4ff..8c34a60 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1740,45 +1740,6 @@
     },
   ],
   'conditions': [
-    ['inside_chromium_build==1', {
-      'targets': [
-        # This target depends on dependencies not fetched by WebKit's DEPS.
-        # In particular, ..\chrome\test\data and ..\third_party\python_26 on
-        # Windows.
-        {
-          'target_name': 'net_unittests_run',
-          'type': 'none',
-          'dependencies': [
-            'net_unittests',
-          ],
-          'includes': [
-            'net_unittests.isolate',
-          ],
-          'actions': [
-            {
-              'action_name': 'isolate',
-              'inputs': [
-                'net_unittests.isolate',
-                '<@(isolate_dependency_tracked)',
-              ],
-              'outputs': [
-                '<(PRODUCT_DIR)/net_unittests.results',
-              ],
-              'action': [
-                'python',
-                '../tools/isolate/isolate.py',
-                '<(test_isolation_mode)',
-                '--outdir', '<(test_isolation_outdir)',
-                '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
-                '--variable', 'OS', '<(OS)',
-                '--result', '<@(_outputs)',
-                '--isolate', 'net_unittests.isolate',
-              ],
-            },
-          ],
-        },
-      ],
-    }],
     ['os_posix == 1 and OS != "mac" and OS != "android"', {
       'targets': [
         {
@@ -1981,5 +1942,41 @@
         },
       ],
     }],
+    ['test_isolation_mode != "noop"', {
+      'targets': [
+        {
+          'target_name': 'net_unittests_run',
+          'type': 'none',
+          'dependencies': [
+            'net_unittests',
+          ],
+          'includes': [
+            'net_unittests.isolate',
+          ],
+          'actions': [
+            {
+              'action_name': 'isolate',
+              'inputs': [
+                'net_unittests.isolate',
+                '<@(isolate_dependency_tracked)',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/net_unittests.results',
+              ],
+              'action': [
+                'python',
+                '../tools/isolate/isolate.py',
+                '<(test_isolation_mode)',
+                '--outdir', '<(test_isolation_outdir)',
+                '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
+                '--variable', 'OS', '<(OS)',
+                '--result', '<@(_outputs)',
+                '--isolate', 'net_unittests.isolate',
+              ],
+            },
+          ],
+        },
+      ],
+    }],
   ],
 }