Remove test_shell_tests dependency on the test_shell binary.

webkit/tools/test_shell/test_shell.gyp

 # Copyright (c) 2009 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,
     'test_shell_windows_resource_files': [
       'resources/test_shell.rc',
       'resources/pan_east.cur',
@@ skipping 170 matching lines @@
             ['exclude', '_win\\.cc$'],
           ],
           'sources!': [
             'drag_delegate.cc',
             'drop_delegate.cc',
           ],
         }],
       ],
     },
     {
+      'target_name': 'test_shell_pak',
+      'type': 'none',
+      'variables': {
+        'repack_path': '../../../tools/data_pack/repack.py',
+        'pak_path': '<(INTERMEDIATE_DIR)/repack/test_shell.pak',
+      },
+      'conditions': [
+        ['OS=="linux"', {
+          'actions': [
+            {
+              'action_name': 'test_shell_repack',
+              'variables': {
+                'pak_inputs': [
+                  '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
+                ],
+              },
+              'inputs': [
+                '<(repack_path)',
+                '<@(pak_inputs)',
+              ],
+              'outputs': [
+                '<(pak_path)',
+              ],
+              'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
+            },
+          ],
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)',
+              'files': ['<(pak_path)'],
+            },
+          ],
+        }],
+      ],
+    },
+    {
       'target_name': 'test_shell',
       'type': 'executable',
       'mac_bundle': 1,
       'msvs_guid': 'FA39524D-3067-4141-888D-28A86C66F2B9',
       'dependencies': [
         'test_shell_common',
         '../../../tools/imagediff/image_diff.gyp:image_diff',
       ],
       'sources': [
         'test_shell_main.cc',
@@ skipping 30 matching lines @@
             # resulting .res files get referenced multiple times.
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
           ],
         }],
         ['OS=="linux"', {
           'dependencies': [
             '../../../build/linux/system.gyp:gtk',
             'test_shell_resources',
-          ],
-          'actions': [
-            {
-              'action_name': 'test_shell_repack',
-              'inputs': [
-                '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
-                '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pak',
-                '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
-                '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
-              ],
-              'outputs': [
-                '<(INTERMEDIATE_DIR)/repack/test_shell.pak',
-              ],
-              'action': ['python', '../../../tools/data_pack/repack.py', '<@(_outputs)', '<@(_inputs)'],
-            },
-          ],
-          'copies': [
-            {
-              'destination': '<(PRODUCT_DIR)',
-              'files': ['<(INTERMEDIATE_DIR)/repack/test_shell.pak'],
-            },
+            'test_shell_pak',
           ],
         }],
         ['OS=="mac"', {
           'product_name': 'TestShell',
           'dependencies': ['layout_test_helper'],
           'variables': {
             'repack_path': '../../../tools/data_pack/repack.py',
           },
           'actions': [
             {
@@ skipping 98 matching lines @@
       ],
       'conditions': [
         ['OS=="win"', {
           'resource_include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit',
           ],
           'sources': [ '<@(test_shell_windows_resource_files)' ],
         }],
         ['OS=="linux"', {
           'dependencies': [
-            # Linux tests use the built test_shell beside the test
-            'test_shell',
+            'test_shell_pak',
             '../../../build/linux/system.gyp:gtk',
           ],
           'sources!': [
              # TODO(port)
             '../../../skia/ext/platform_canvas_unittest.cc',
           ],
         }],
         ['OS=="mac"', {
           # mac tests load the resources from the built test_shell beside the
           # test
@@ skipping 281 matching lines @@
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
             ],
           },
         },
       ],
     }],
   ],
 }