summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-24 21:40:57 +0000
committerdpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-24 21:40:57 +0000
commit6f324234680499d621c1277dec1abb08fde3cc0a (patch)
tree3c0a3d76072c759b6878aaa874b04e42bf2652cd /webkit
parent2b73aec066298ca977629eb03b1bf8f61a081735 (diff)
downloadchromium_src-6f324234680499d621c1277dec1abb08fde3cc0a.zip
chromium_src-6f324234680499d621c1277dec1abb08fde3cc0a.tar.gz
chromium_src-6f324234680499d621c1277dec1abb08fde3cc0a.tar.bz2
re-do CL 2136 - move image_diff to tools/imagediff, add deps to test_shell
moving image_diff from chrome/tools/test/image_diff to tools/imagediff (not moving to tools/image_diff to avoid some svn unpleasantness with that directory having been created in CL 21366). Also change test_shell.gyp to depend on everything needed to run the layout tests. R=darin@chromium.org TEST=none BUG=none Review URL: http://codereview.chromium.org/159361 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21584 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/test_shell.gyp3
1 files changed, 3 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index 539ad34..330bb01 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -183,6 +183,8 @@
'msvs_guid': 'FA39524D-3067-4141-888D-28A86C66F2B9',
'dependencies': [
'test_shell_common',
+ 'npapi_layout_test_plugin',
+ '../../../tools/imagediff/image_diff.gyp:image_diff',
],
'sources': [
'test_shell_main.cc',
@@ -206,6 +208,7 @@
},
'conditions': [
['OS=="win"', {
+ 'dependencies': ['test_worker'],
'resource_include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)/webkit',
],