diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 03:43:27 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 03:43:27 +0000 |
| commit | 27c1042908c0a597cba7c41e392082df18ac46da (patch) | |
| tree | 0bd15e889385bfcb407e100a7c5f0307d7623e96 | |
| parent | 171af2b154232760d901bcb827472a70f2826342 (diff) | |
| download | chromium_src-27c1042908c0a597cba7c41e392082df18ac46da.zip chromium_src-27c1042908c0a597cba7c41e392082df18ac46da.tar.gz chromium_src-27c1042908c0a597cba7c41e392082df18ac46da.tar.bz2 | |
Disable plugin browser_tests failing on Win64 build
BUG=244653
TBR=asargent@chromium.org,mmenke@chromium.org
R=asargent@chromium.org,mmenke@chromium.org
Review URL: https://chromiumcodereview.appspot.com/16021015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203657 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/plugin_apitest.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/prerender/prerender_browsertest.cc | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc index eb94d77..39b1118 100644 --- a/chrome/browser/extensions/plugin_apitest.cc +++ b/chrome/browser/extensions/plugin_apitest.cc @@ -116,6 +116,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) { #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) // Timing out on ARM linux http://crbug.com/238467 #define MAYBE_PluginPrivate DISABLED_PluginPrivate +#elif defined(OS_WIN) && defined(ARCH_CPU_X86_64) +// TODO(jschuh): Failing plugin tests. crbug.com/244653 +#define MAYBE_PluginPrivate DISABLED_PluginPrivate #else #define MAYBE_PluginPrivate PluginPrivate #endif diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index 72bb371..eaa89b7 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -1454,6 +1454,9 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderAlertAfterOnload) { #elif defined(OS_MACOSX) // http://crbug.com/100514 #define MAYBE_PrerenderDelayLoadPlugin DISABLED_PrerenderDelayLoadPlugin +#elif defined(OS_WIN) && defined(ARCH_CPU_X86_64) +// TODO(jschuh): Failing plugin tests. crbug.com/244653 +#define MAYBE_PrerenderDelayLoadPlugin DISABLED_PrerenderDelayLoadPlugin #else #define MAYBE_PrerenderDelayLoadPlugin PrerenderDelayLoadPlugin #endif @@ -1514,6 +1517,10 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNaClPluginDisabled) { // http://crbug.com/100514 #define MAYBE_PrerenderIframeDelayLoadPlugin \ DISABLED_PrerenderIframeDelayLoadPlugin +#elif defined(OS_WIN) && defined(ARCH_CPU_X86_64) +// TODO(jschuh): Failing plugin tests. crbug.com/244653 +#define MAYBE_PrerenderIframeDelayLoadPlugin \ + DISABLED_PrerenderIframeDelayLoadPlugin #else #define MAYBE_PrerenderIframeDelayLoadPlugin PrerenderIframeDelayLoadPlugin #endif |