Revert "Replace test_shell_tests dependency on the test_shell with test_shell_pak dependency."

This needs to wait on a master.cfg update to make f_webkit_dbg_linux_builder build 'test_shell'.

TBR:mark


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

webkit/tools/test_shell/test_shell.gyp

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