summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell
diff options
context:
space:
mode:
authorthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-03 17:33:42 +0000
committerthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-03 17:33:42 +0000
commite93657170f4dac1dcc6331ee6ebe4079c3d3de04 (patch)
treee8cb80b3fde5fcab120683d7a0ab1a843732c3d7 /webkit/tools/test_shell
parente3d8359a971fb5632ca597296836d5cad559ace7 (diff)
downloadchromium_src-e93657170f4dac1dcc6331ee6ebe4079c3d3de04.zip
chromium_src-e93657170f4dac1dcc6331ee6ebe4079c3d3de04.tar.gz
chromium_src-e93657170f4dac1dcc6331ee6ebe4079c3d3de04.tar.bz2
Make test_shell_tests depend on test_shell since the mac version pulls resources from bundle
it expects to have sitting beside it. Review URL: http://codereview.chromium.org/39019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10802 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell')
-rw-r--r--webkit/tools/test_shell/test_shell.gyp5
1 files changed, 5 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index 64783c7..cefe517 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -192,6 +192,11 @@
'text_input_controller_unittest.cc',
],
'conditions': [
+ ['OS=="mac"', {
+ # mac tests load the resources from the built test_shell beside the
+ # test
+ 'dependencies': ['test_shell'],
+ }],
['OS=="win"', {
'msvs_disabled_warnings': [ 4800 ],
}, { # else: OS!=win