Commit cb7f1cfe authored by Caleb Raitto's avatar Caleb Raitto Committed by Commit Bot

Disable leaking browser_tests on LSAN.

See crrev.com/c/1590404 and the linked bug for context -- the goal is to
fix the broken memory-leak checking in Chromium's ASAN
(AddressSanitizer) trybots, which are supposed to also run LSAN
(LeakSanitizer).

Currently-leaking tests must be fixed or disabled before leak checking
can be enabled in the ASAN trybot.

WARNING: This will result in a loss of ASAN coverage for the affected
tests given that LSAN runs as part of the ASAN trybot.

If that's not acceptable, we can wait until the leaks are fixed before
fixing leak detection in trybots, but keep in mind that newly-introduced
leaks Chromium-wide won't be caught until then.

Bug: 961017
Change-Id: Ie2d163715da8322c8727030a153ed9600462a7ce
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1636866
Commit-Queue: Caleb Raitto <caraitto@chromium.org>
Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Reviewed-by: default avatarTrent Apted <tapted@chromium.org>
Reviewed-by: default avatarFinnur Thorarinsson <finnur@chromium.org>
Cr-Commit-Position: refs/heads/master@{#666306}
parent 4eff4ff2
...@@ -1394,8 +1394,15 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, ...@@ -1394,8 +1394,15 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
ASSERT_TRUE(synthetic_wheel_listener.WaitUntilSatisfied()); ASSERT_TRUE(synthetic_wheel_listener.WaitUntilSatisfied());
} }
// TODO(crbug.com/961017): Fix memory leaks in tests and re-enable on LSAN.
#if defined(LEAK_SANITIZER)
#define MAYBE_PictureInPicture DISABLED_PictureInPicture
#else
#define MAYBE_PictureInPicture PictureInPicture
#endif
// Tests that platform apps can enter and exit Picture-in-Picture. // Tests that platform apps can enter and exit Picture-in-Picture.
IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, PictureInPicture) { IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_PictureInPicture) {
LoadAndLaunchPlatformApp("picture_in_picture", "Launched"); LoadAndLaunchPlatformApp("picture_in_picture", "Launched");
WebContents* web_contents = GetFirstAppWindowWebContents(); WebContents* web_contents = GetFirstAppWindowWebContents();
......
...@@ -65,7 +65,18 @@ class PageCaptureSaveAsMHTMLDelegate ...@@ -65,7 +65,18 @@ class PageCaptureSaveAsMHTMLDelegate
base::FilePath temp_file_; base::FilePath temp_file_;
}; };
IN_PROC_BROWSER_TEST_F(ExtensionPageCaptureApiTest, SaveAsMHTML) { // TODO(crbug.com/961017): Fix memory leaks in tests and re-enable on LSAN.
#ifdef LEAK_SANITIZER
#define MAYBE_SaveAsMHTML DISABLED_SaveAsMHTML
#define MAYBE_SaveAsMHTMLWithActiveTabWithFileAccess \
DISABLED_SaveAsMHTMLWithActiveTabWithFileAccess
#else
#define MAYBE_SaveAsMHTML SaveAsMHTML
#define MAYBE_SaveAsMHTMLWithActiveTabWithFileAccess \
SaveAsMHTMLWithActiveTabWithFileAccess
#endif
IN_PROC_BROWSER_TEST_F(ExtensionPageCaptureApiTest, MAYBE_SaveAsMHTML) {
ASSERT_TRUE(StartEmbeddedTestServer()); ASSERT_TRUE(StartEmbeddedTestServer());
PageCaptureSaveAsMHTMLDelegate delegate; PageCaptureSaveAsMHTMLDelegate delegate;
ASSERT_TRUE(RunExtensionTestWithFlagsAndArg( ASSERT_TRUE(RunExtensionTestWithFlagsAndArg(
...@@ -83,7 +94,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionPageCaptureApiTest, SaveAsMHTML) { ...@@ -83,7 +94,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionPageCaptureApiTest, SaveAsMHTML) {
} }
IN_PROC_BROWSER_TEST_F(ExtensionPageCaptureApiTest, IN_PROC_BROWSER_TEST_F(ExtensionPageCaptureApiTest,
SaveAsMHTMLWithActiveTabWithFileAccess) { MAYBE_SaveAsMHTMLWithActiveTabWithFileAccess) {
ASSERT_TRUE(StartEmbeddedTestServer()); ASSERT_TRUE(StartEmbeddedTestServer());
PageCaptureSaveAsMHTMLDelegate delegate; PageCaptureSaveAsMHTMLDelegate delegate;
ASSERT_TRUE(RunExtensionTest("page_capture")) << message_; ASSERT_TRUE(RunExtensionTest("page_capture")) << message_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment