diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 16:52:12 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 16:52:12 +0000 |
| commit | c9b3fb0bd845b8911fa3aa2400717dff34713e24 (patch) | |
| tree | 551e9e38bd5fc49fccef99ae046be540eb1bd330 /webkit | |
| parent | b3db1e412fac9c9ae91e718b17da6f55a05a766c (diff) | |
| download | chromium_src-c9b3fb0bd845b8911fa3aa2400717dff34713e24.zip chromium_src-c9b3fb0bd845b8911fa3aa2400717dff34713e24.tar.gz chromium_src-c9b3fb0bd845b8911fa3aa2400717dff34713e24.tar.bz2 | |
Copy the npapi pepper test plugin during the build so we don't
have to do it when running the test.
Remove all the code in the test for copying files since it's no longer needed.
Review URL: http://codereview.chromium.org/3048048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55235 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 68 |
1 files changed, 67 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index 5bbb1fa..52d68bc 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -124,7 +124,7 @@ # http://code.google.com/p/chromium/issues/detail?id=18337 ['target_arch!="x64" and target_arch!="arm"', { 'dependencies': [ - 'npapi_test_plugin', + 'copy_npapi_test_plugin', ], }], ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { @@ -583,6 +583,39 @@ ], }, { + 'target_name': 'copy_npapi_test_plugin', + 'type': 'none', + 'dependencies': [ + 'npapi_test_plugin', + ], + 'conditions': [ + ['OS=="win"', { + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)/plugins', + 'files': ['<(PRODUCT_DIR)/npapi_test_plugin.dll'], + }, + ], + }], + ['OS=="mac"', { + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)/plugins/', + 'files': ['<(PRODUCT_DIR)/npapi_test_plugin.plugin'], + }, + ] + }], + ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)/plugins', + 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], + }, + ], + }], + ], + }, + { 'target_name': 'npapi_pepper_test_plugin', 'type': 'loadable_module', 'mac_bundle': 1, @@ -616,6 +649,39 @@ 'INFOPLIST_FILE': '<(DEPTH)/webkit/tools/npapi_pepper_test_plugin/Info.plist', }, }, + { + 'target_name': 'copy_npapi_pepper_test_plugin', + 'type': 'none', + 'dependencies': [ + 'npapi_pepper_test_plugin', + ], + 'conditions': [ + ['OS=="win"', { + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)/plugins', + 'files': ['<(PRODUCT_DIR)/npapi_pepper_test_plugin.dll'], + }, + ], + }], + ['OS=="mac"', { + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)/plugins/', + 'files': ['<(PRODUCT_DIR)/npapi_pepper_test_plugin.plugin/'], + }, + ] + }], + ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)/plugins', + 'files': ['<(PRODUCT_DIR)/libnpapi_pepper_test_plugin.so'], + }, + ], + }], + ], + }, ], }], ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { |