diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-16 21:29:27 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-16 21:29:27 +0000 |
| commit | 0bc9cc0a33fff5ff96a62f38e90293427821e1aa (patch) | |
| tree | ce1d7052ffda46309e3d927d87adaadd6c15f599 /webkit/tools/test_shell/plugin_tests.cc | |
| parent | 142648d149fbb663fb405b0e46d32095964df0e1 (diff) | |
| download | chromium_src-0bc9cc0a33fff5ff96a62f38e90293427821e1aa.zip chromium_src-0bc9cc0a33fff5ff96a62f38e90293427821e1aa.tar.gz chromium_src-0bc9cc0a33fff5ff96a62f38e90293427821e1aa.tar.bz2 | |
Enable many of the NPAPI UI tests on Mac
BUG=none
TEST=N/A
Review URL: http://codereview.chromium.org/503029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/plugin_tests.cc')
| -rw-r--r-- | webkit/tools/test_shell/plugin_tests.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/plugin_tests.cc b/webkit/tools/test_shell/plugin_tests.cc index 40064a3..4dc58da 100644 --- a/webkit/tools/test_shell/plugin_tests.cc +++ b/webkit/tools/test_shell/plugin_tests.cc @@ -30,6 +30,12 @@ using WebKit::WebString; #define TEST_PLUGIN_NAME "libnpapi_test_plugin.so" #endif +#if defined(OS_MACOSX) +#define TEST_PLUGIN_DIRECTORY "PlugIns" +#else +#define TEST_PLUGIN_DIRECTORY "plugins" +#endif + // Ignore these until 64-bit plugin build is fixed. http://crbug.com/18337 #if !defined(ARCH_CPU_64_BITS) // Provides functionality for creating plugin tests. @@ -41,7 +47,7 @@ class PluginTest : public TestShellTest { plugin_src_ = executable_directory.AppendASCII(TEST_PLUGIN_NAME); CHECK(file_util::PathExists(plugin_src_)); - plugin_file_path_ = executable_directory.AppendASCII("plugins"); + plugin_file_path_ = executable_directory.AppendASCII(TEST_PLUGIN_DIRECTORY); file_util::CreateDirectory(plugin_file_path_); plugin_file_path_ = plugin_file_path_.AppendASCII(TEST_PLUGIN_NAME); |