modify test_shell target to build everything for layout_tests, move image_diff to tools/

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 164 matching lines @@
         }],
       ],
     },
     {
       'target_name': 'test_shell',
       'type': 'executable',
       'mac_bundle': 1,
       'msvs_guid': 'FA39524D-3067-4141-888D-28A86C66F2B9',
       'dependencies': [
         'test_shell_common',
+        'npapi_layout_test_plugin',
+        '../../../tools/image_diff/image_diff.gyp:image_diff',
       ],
       'sources': [
         'test_shell_main.cc',
       ],
       'mac_bundle_resources': [
         '../../data/test_shell/',
         'mac/English.lproj/InfoPlist.strings',
         'mac/English.lproj/MainMenu.nib',
         'mac/Info.plist',
         'mac/test_shell.icns',
         'resources/AHEM____.TTF',
       ],
       'mac_bundle_resources!': [
         # TODO(mark): Come up with a fancier way to do this (mac_info_plist?)
         # that automatically sets the correct INFOPLIST_FILE setting and adds
         # the file to a source group.
         'mac/Info.plist',
       ],
       'xcode_settings': {
         'INFOPLIST_FILE': 'mac/Info.plist',
       },
       'conditions': [
         ['OS=="win"', {
+          'dependencies': ['test_worker'],
           'resource_include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit',
           ],
           'sources': [
             '<@(test_shell_windows_resource_files)',
             # TODO:  It would be nice to have these pulled in
             # automatically from direct_dependent_settings in
             # their various targets (net.gyp:net_resources, etc.),
             # but that causes errors in other targets when
             # resulting .res files get referenced multiple times.
@@ skipping 24 matching lines @@
           ],
           'copies': [
             {
               'destination': '<(PRODUCT_DIR)',
               'files': ['<(INTERMEDIATE_DIR)/repack/test_shell.pak'],
             },
           ],
         }],
         ['OS=="mac"', {
           'product_name': 'TestShell',
-          'dependencies': ['layout_test_helper'],
+          'dependencies': ['layout_test_helper', 'test_worker'],
           'variables': {
             'repack_path': '../../../tools/data_pack/repack.py',
           },
           'actions': [
             {
               # TODO(mark): Make this work with more languages than the
               # hardcoded en-US.
               'action_name': 'repack_locale',
               'variables': {
                 'pak_inputs': [
@@ skipping 368 matching lines @@
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
             ],
           },
         },
       ]
     }],
   ],
 }