Convert isolate.py to exclusively use .isolate files.

net/net.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': {
     'chromium_code': 1,
 
     'linux_link_kerberos%': 0,
     'conditions': [
@@ skipping 1338 matching lines @@
           ],
         }]
       ],
     },
     {
       'target_name': 'net_unittests_run',
       'type': 'none',
       'dependencies': [
         'net_unittests',
       ],
+      'includes': [
+        'net_unittests.isolate',
+      ],
       'actions': [
         {
-          'action_name': 'response_file',
-          'inputs': [
-            '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)',
-            '<(DEPTH)/testing/test_env.py',
-            '<(DEPTH)/testing/xvfb.py',
-            '<(DEPTH)/third_party/pyftpdlib/src/pyftpdlib/__init__.py',
-            '<(DEPTH)/third_party/pyftpdlib/src/pyftpdlib/ftpserver.py',
-          ],
-          'conditions': [
-            ['OS=="linux"', {
-              'inputs': [
-                '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
-              ],
-            }],
-          ],
-          'outputs': [
-            '<(PRODUCT_DIR)/net_unittests.inputs',
-          ],
-          'action': [
-            'python',
-            '-c',
-            'import sys; '
-                'open(sys.argv[1], \'w\').write(\'\\n\'.join(sys.argv[2:]))',
-            '<@(_outputs)',
-            '<@(_inputs)',
-          ],
-        },
-        {
           'action_name': 'isolate',
           'inputs': [
-            '<(PRODUCT_DIR)/net_unittests.inputs',
+            '<@(isolate_dependency_tracked)',

[Ryan Sleevi, 2012/04/11 18:37:04]

In terms of the purest of pedantry, it might be good to also add a dependency on
net.isolate itself, since it influences the action. If net_unittests.isolate
changes on disk, you want the action re-run, correct?

Or does it not matter with how you're intending to use this target, since it's
just a meta-target and not a build product?

[M-A Ruel, 2012/04/11 18:41:44]

Technically, if you edit the file, you need to re-run build/gyp_chromium. I
guess it'd make sense to have it be a dependency anyway so I added it.

           ],
           'outputs': [
             '<(PRODUCT_DIR)/net_unittests.results',
           ],
           'action': [
             'python',
-            '<(DEPTH)/tools/isolate/isolate.py',
-            '--mode=<(tests_run)',
-            '--root', '<(DEPTH)',
+            '../tools/isolate/isolate.py',
+            '--mode', '<(tests_run)',
+            '--variable', 'PRODUCT_DIR=<(PRODUCT_DIR)',
+            '--variable', 'OS=<(OS)',
             '--result', '<@(_outputs)',
-            '--files', '<@(_inputs)',
-            # Directories can't be tracked by build tools (make, msbuild, xcode,
-            # etc) so we just put it on the command line without specifying it
-            # as an input.
-            # TODO(maruel): Revisit the support for this at all and list each
-            # individual test files instead.
-            'data/',
-            'tools/testserver/',
-            '<(DEPTH)/third_party/tlslite/tlslite/',
-            '--',
-            # Wraps net_unittests under xvfb.
-            '<(DEPTH)/testing/xvfb.py',
-            '<(PRODUCT_DIR)',
-            '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)',
+            'net_unittests.isolate',
           ],
         },
       ],
     },
     {
       'target_name': 'net_perftests',
       'type': 'executable',
       'dependencies': [
         'net',
         'net_test_support',
@@ skipping 414 matching lines @@
             'tools/dump_cache/url_to_filename_encoder.cc',
             'tools/dump_cache/url_to_filename_encoder.h',
             'tools/dump_cache/url_utilities.h',
             'tools/dump_cache/url_utilities.cc',
           ],
         },
       ],
     }],
   ],
 }