Separate xvfb.py logic into its own script

base/base.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,
   },
   'includes': [
     '../build/win_precompile.gypi',
@@ skipping 429 matching lines @@
         'test/values_test_util.cc',
         'test/values_test_util.h',
       ],
     },
     {
       'target_name': 'base_unittests_run',
       'type': 'none',
       'dependencies': [
         'base_unittests',
       ],
+      'variables': {
+        'test_inputs': [
+          '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/xdisplaycheck',
+          '<(DEPTH)/testing/test_env.py',
+          '<(DEPTH)/testing/xvfb.py',
+        ],
+        'conditions': [
+          ['OS != "mac" and OS != "win"', {
+            'test_inputs': [
+              '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+            ],
+          }],
+          ['OS == "win"', {
+            'test_inputs': [
+              'data/file_version_info_unittest/FileVersionInfoTest1.dll',
+              'data/file_version_info_unittest/FileVersionInfoTest2.dll',
+            ],
+          }],
+        ],
+      },
       'actions': [
         {
+          'action_name': 'response_file',
+          'inputs': [
+            '<@(test_inputs)',
+          ],
+          'outputs': [
+            '<(PRODUCT_DIR)/base_unittests.inputs',
+          ],
+          'action': [
+            'python',
+            '-c',
+            'import sys; '

[M-A Ruel, 2012/03/07 20:21:05]

This doesn't seem optimal but it permits me to keep going on.

+                'open(sys.argv[1], "w").write("\\n".join(sys.argv[2:]))',
+            '<@(_outputs)',
+            '<@(_inputs)',
+          ],
+        },
+        {
           'action_name': 'isolate',
           'inputs': [
-            '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
-          ],
-          'conditions': [
-            ['OS != "mac" and OS != "win"', {
-              'inputs': [
-                '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
-              ],
-            }],
-            ['OS == "win"', {
-              'inputs': [
-                'data/file_version_info_unittest/FileVersionInfoTest1.dll',
-                'data/file_version_info_unittest/FileVersionInfoTest2.dll',
-              ],
-            }],
+            '<(PRODUCT_DIR)/base_unittests.inputs',
           ],
           'outputs': [
             '<(PRODUCT_DIR)/base_unittests.results',
           ],
           'action': [
             'python',
             '<(DEPTH)/tools/isolate/isolate.py',
             '--mode=<(tests_run)',
             '--root', '<(DEPTH)',
             '--result', '<@(_outputs)',
-            '<@(_inputs)',
+            '--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/file_util_unittest/',
+            '--',
+            # Wraps base_unittests under xvfb.
+            '<(DEPTH)/testing/xvfb.py',
+            '<(PRODUCT_DIR)',
+            '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
           ],
         },
       ],
     },
     {
       'target_name': 'test_support_perf',
       'type': 'static_library',
       'dependencies': [
         'base',
         '../testing/gtest.gyp:gtest',
@@ skipping 95 matching lines @@
              # treated as weak imports in dependents, who still must
              # #include closure_blocks_leopard_compat.h to get weak imports.
              'type': 'none',
            }],
          ],
        },
      ],
    }],
   ],
 }