Separate xvfb.py logic into its own script

base/base.gyp

Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 2d242bd30772006eaf6fa3621e36df126cd241ac..06c33ed511a5f649b1bc3a592c5b56181ed7b64e 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -447,24 +447,49 @@
       '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': 'isolate',
+          'action_name': 'response_file',
           'inputs': [
-            '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
+            '<@(test_inputs)',
           ],
-          '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',
-              ],
-            }],
+          '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.inputs',
           ],
           'outputs': [
             '<(PRODUCT_DIR)/base_unittests.results',
@@ -475,13 +500,18 @@
             '--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)',
           ],
         },
       ],