diff options
| author | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-05 12:32:14 +0000 |
|---|---|---|
| committer | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-05 12:32:14 +0000 |
| commit | 4fd64bb83feca6f121968625dcbd4118bc02f491 (patch) | |
| tree | 2f00263c3f8272618337291fa43a89b7b43fee91 | |
| parent | 93d2ad0b6fb9e0c402caa29083948fc8bca10ab4 (diff) | |
| download | chromium_src-4fd64bb83feca6f121968625dcbd4118bc02f491.zip chromium_src-4fd64bb83feca6f121968625dcbd4118bc02f491.tar.gz chromium_src-4fd64bb83feca6f121968625dcbd4118bc02f491.tar.bz2 | |
Disable several leaky browser tests in LeakSanitizer builds.
BUG=317363, 321662, 348994
TBR=wtc@chromium.org,lazyboy@chromium.org, jamesr@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/187343008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255022 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/apps/web_view_browsertest.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_browser_tests.cc | 3 | ||||
| -rw-r--r-- | content/renderer/render_thread_impl_browsertest.cc | 10 |
3 files changed, 18 insertions, 3 deletions
diff --git a/chrome/browser/apps/web_view_browsertest.cc b/chrome/browser/apps/web_view_browsertest.cc index ed3e5b1..0444c25 100644 --- a/chrome/browser/apps/web_view_browsertest.cc +++ b/chrome/browser/apps/web_view_browsertest.cc @@ -968,7 +968,13 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestResizeWebviewResizesContent) { // This test makes sure we do not crash if app is closed while interstitial // page is being shown in guest. -IN_PROC_BROWSER_TEST_F(WebViewTest, InterstitialTeardown) { +// Disabled under LeakSanitizer due to memory leaks. http://crbug.com/321662 +#if defined(LEAK_SANITIZER) +#define MAYBE_InterstitialTeardown DISABLED_InterstitialTeardown +#else +#define MAYBE_InterstitialTeardown InterstitialTeardown +#endif +IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_InterstitialTeardown) { #if defined(OS_WIN) // Flaky on XP bot http://crbug.com/297014 if (base::win::GetVersion() <= base::win::VERSION_XP) diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index bcf8cf1..b5c862c 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -576,7 +576,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndGoForward) { // certificate. Close the page while WSS connection waits for SSLManager's // response from UI thread. // Disabled on Windows because it was flaking on XP Tests (1). crbug.com/165258 -#if defined(OS_WIN) +// Disabled under LeakSanitizer due to memory leaks. http://crbug.com/317363 +#if defined(OS_WIN) || defined(LEAK_SANITIZER) #define MAYBE_TestWSSInvalidCertAndClose DISABLED_TestWSSInvalidCertAndClose #else #define MAYBE_TestWSSInvalidCertAndClose TestWSSInvalidCertAndClose diff --git a/content/renderer/render_thread_impl_browsertest.cc b/content/renderer/render_thread_impl_browsertest.cc index d8dc67b..3164c61 100644 --- a/content/renderer/render_thread_impl_browsertest.cc +++ b/content/renderer/render_thread_impl_browsertest.cc @@ -31,8 +31,16 @@ void CheckRenderThreadInputHandlerManager(RenderThreadImpl* thread) { // Check that InputHandlerManager outlives compositor thread because it uses // raw pointers to post tasks. +// Disabled under LeakSanitizer due to memory leaks. http://crbug.com/348994 +#if defined(LEAK_SANITIZER) +#define MAYBE_InputHandlerManagerDestroyedAfterCompositorThread \ + DISABLED_InputHandlerManagerDestroyedAfterCompositorThread +#else +#define MAYBE_InputHandlerManagerDestroyedAfterCompositorThread \ + InputHandlerManagerDestroyedAfterCompositorThread +#endif TEST_F(RenderThreadImplBrowserTest, - InputHandlerManagerDestroyedAfterCompositorThread) { + MAYBE_InputHandlerManagerDestroyedAfterCompositorThread) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableThreadedCompositing); |