diff options
| author | dpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-23 01:40:12 +0000 |
|---|---|---|
| committer | dpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-23 01:40:12 +0000 |
| commit | e64edf70b0a1ae80dd327965d9ea804fce9a09d5 (patch) | |
| tree | 2098d1c1128c362254e5bbed77cc5440832af915 /webkit | |
| parent | 01ca4935562aae152719ad39035fc013b2eec5f6 (diff) | |
| download | chromium_src-e64edf70b0a1ae80dd327965d9ea804fce9a09d5.zip chromium_src-e64edf70b0a1ae80dd327965d9ea804fce9a09d5.tar.gz chromium_src-e64edf70b0a1ae80dd327965d9ea804fce9a09d5.tar.bz2 | |
re-do CL 21252 - move image_diff to tools, add deps to test_shell
CL 21252 seems to have had some svn brokenness (not sure why). I've recreated
it and resubmitted it. The changes are to move image_diff from
chrome/tools/test to tools/, and to make test_shell depend on image_diff
and npapi_layout_test_plugin (and test_worker, where applicable)
R=nsylvain@chromium.org
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/155959
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21366 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index 539ad34..31a8eed 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/image_diff/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', ], @@ -250,7 +253,7 @@ }], ['OS=="mac"', { 'product_name': 'TestShell', - 'dependencies': ['layout_test_helper'], + 'dependencies': ['layout_test_helper','test_worker'], 'variables': { 'repack_path': '../../../tools/data_pack/repack.py', }, |