summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/plugin_tests.cc
diff options
context:
space:
mode:
authormmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-31 18:58:19 +0000
committermmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-31 18:58:19 +0000
commitc98a515a1fc51379f966d53671e9032b5d873c86 (patch)
treeee0db7cb26ceec9b5f6aff72332811c5674d14e7 /webkit/tools/test_shell/plugin_tests.cc
parent57771c60a91f27a216e2c30f04b570f5751f3ed6 (diff)
downloadchromium_src-c98a515a1fc51379f966d53671e9032b5d873c86.zip
chromium_src-c98a515a1fc51379f966d53671e9032b5d873c86.tar.gz
chromium_src-c98a515a1fc51379f966d53671e9032b5d873c86.tar.bz2
Linux 64-bit: Fix failing unit_tests and ignore non-working plugin/media tests.
Related bugs: http://crbug.com/18337 http://crbug.com/20467 Review URL: http://codereview.chromium.org/175019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24913 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/plugin_tests.cc')
-rw-r--r--webkit/tools/test_shell/plugin_tests.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/plugin_tests.cc b/webkit/tools/test_shell/plugin_tests.cc
index 729bc33..fedc908 100644
--- a/webkit/tools/test_shell/plugin_tests.cc
+++ b/webkit/tools/test_shell/plugin_tests.cc
@@ -30,6 +30,8 @@ using WebKit::WebString;
#define TEST_PLUGIN_NAME "libnpapi_test_plugin.so"
#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.
class PluginTest : public TestShellTest {
public:
@@ -204,3 +206,4 @@ TEST_F(PluginTest, PluginVisibilty) {
ASSERT_TRUE(IsWindowVisible(plugin_hwnd));
}
#endif
+#endif //!ARCH_CPU_64_BITS