diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-05 21:21:20 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-05 21:21:20 +0000 |
| commit | 413ef0200f8b440d62f31de69fa02a203971a2ca (patch) | |
| tree | b0e2255e276241dfd338a326b7268fbf6c38b762 /webkit/tools | |
| parent | 31024059f0a8b7e22c298fbe6657e33342357118 (diff) | |
| download | chromium_src-413ef0200f8b440d62f31de69fa02a203971a2ca.zip chromium_src-413ef0200f8b440d62f31de69fa02a203971a2ca.tar.gz chromium_src-413ef0200f8b440d62f31de69fa02a203971a2ca.tar.bz2 | |
Copy the layout test plugin during a gyp step instead of
when the test is running.
Review URL: http://codereview.chromium.org/3028045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55126 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.gypi | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/webkit/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.gypi b/webkit/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.gypi index 3e20342..b64dcb1 100644 --- a/webkit/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.gypi +++ b/webkit/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.gypi @@ -107,7 +107,7 @@ ['OS=="mac"', { 'copies': [ { - 'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/PlugIns/', + 'destination': '<(PRODUCT_DIR)/plugins/', 'files': ['<(PRODUCT_DIR)/TestNetscapePlugIn.plugin/'], }, ] diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index f3e25ee..5bbb1fa 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -317,6 +317,13 @@ '<(PRODUCT_DIR)/libffmpegsumo.dylib', ], }, + { + # TODO(tony): We should have TestShell.app load plugins from + # <(PRODUCT_DIR)/plugins so we don't have this extra copy of + # the plugin. + 'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/PlugIns/', + 'files': ['<(PRODUCT_DIR)/TestNetscapePlugIn.plugin/'], + }, ], }, { # OS != "mac" 'dependencies': [ |