diff options
| author | dpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-22 00:54:44 +0000 |
|---|---|---|
| committer | dpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-22 00:54:44 +0000 |
| commit | 31856be711996fc573ca6203db7512ab6089899d (patch) | |
| tree | 301ecc34c8d5352765c83504e7eddef4571e89ae /webkit | |
| parent | a1f55c87febb264d1c89afaadf8f8631b7155fa7 (diff) | |
| download | chromium_src-31856be711996fc573ca6203db7512ab6089899d.zip chromium_src-31856be711996fc573ca6203db7512ab6089899d.tar.gz chromium_src-31856be711996fc573ca6203db7512ab6089899d.tar.bz2 | |
make 'test_shell' target depend on everything needed to pass layout_tests
This adds project dependencies to test_shell so that all (and only?)
the targets needed for the layout_tests to run cleanly are built. On most
platforms this is test_shell, npapi_test_plugin, and test_worker, and on
the Mac this adds the layout_test_helper binary as well
also, this moves image_diff from chrome/tools/test to tools/
R=mmentovai@google.com, darin@google.com
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/149714
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21252 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 8313eff..238a927 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -182,6 +182,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', @@ -205,6 +207,7 @@ }, 'conditions': [ ['OS=="win"', { + 'dependencies': ['test_worker'], 'resource_include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/webkit', ], @@ -249,7 +252,7 @@ }], ['OS=="mac"', { 'product_name': 'TestShell', - 'dependencies': ['layout_test_helper'], + 'dependencies': ['layout_test_helper', 'test_worker'], 'variables': { 'repack_path': '../../../tools/data_pack/repack.py', }, |