Replace test_shell_tests dependency on the test_shell with test_shell_pak dependency.

This fixes the missing requirement that test_shell was previously satisifying for test_shell_tests.

Review URL: http://codereview.chromium.org/201067


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

webkit/tools/test_shell/test_shell.gyp

@@ -187,6 +187,45 @@
         }],
       ],
     },
+    {
+      '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',
@@ -238,27 +277,7 @@
           '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"', {
@@ -377,8 +396,7 @@
         }],
         ['OS=="linux"', {
           'dependencies': [
-            # Linux tests use the built test_shell beside the test
-            'test_shell',
+            'test_shell_pak',
             '../../../build/linux/system.gyp:gtk',
           ],
           'sources!': [