diff options
| author | thestig <thestig@chromium.org> | 2015-06-24 16:46:36 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-24 23:47:19 +0000 |
| commit | f85653165e190343bb3b73f23090d34a0c231657 (patch) | |
| tree | b45fbbc0752e06225a93306b6717ab04e4305c39 | |
| parent | 6dd51554c5c0c8378096aa47b04baf5b5c004560 (diff) | |
| download | chromium_src-f85653165e190343bb3b73f23090d34a0c231657.zip chromium_src-f85653165e190343bb3b73f23090d34a0c231657.tar.gz chromium_src-f85653165e190343bb3b73f23090d34a0c231657.tar.bz2 | |
MSAN: Disable flaky tests.
Also re-enable a DrMemory test that has been fixed.
BUG=503329,504051,504141
TBR=groby@chromium.org
Review URL: https://codereview.chromium.org/1204933007
Cr-Commit-Position: refs/heads/master@{#336031}
3 files changed, 15 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/login/saml/saml_browsertest.cc b/chrome/browser/chromeos/login/saml/saml_browsertest.cc index 6bc72b3..0d8d284 100644 --- a/chrome/browser/chromeos/login/saml/saml_browsertest.cc +++ b/chrome/browser/chromeos/login/saml/saml_browsertest.cc @@ -417,7 +417,14 @@ class SamlTest : public OobeBaseTest, public testing::WithParamInterface<bool> { // Tests that signin frame should have 'saml' class and 'cancel' button is // visible when SAML IdP page is loaded. And 'cancel' button goes back to // gaia on clicking. -IN_PROC_BROWSER_TEST_P(SamlTest, SamlUI) { +// +// Times out on CrOS MSAN. https://crbug.com/504141 +#if defined(MEMORY_SANITIZER) +#define MAYBE_SamlUI DISABLED_SamlUI +#else +#define MAYBE_SamlUI SamlUI +#endif +IN_PROC_BROWSER_TEST_P(SamlTest, MAYBE_SamlUI) { fake_saml_idp()->SetLoginHTMLTemplate("saml_login.html"); StartSamlAndWaitForIdpPageLoad(kFirstSAMLUserEmail); diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc index 6b7a947..e7ff754 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc @@ -614,7 +614,13 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, CancelScan) { ASSERT_TRUE(RunMediaGalleriesTest("cancel_scan")) << message_; } -IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, Scan) { +// Flaky time outs on MSAN. https://crbug.com/503329 +#if defined(MEMORY_SANITIZER) +#define MAYBE_Scan DISABLED_Scan +#else +#define MAYBE_Scan Scan +#endif +IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, MAYBE_Scan) { base::ScopedTempDir scan_root; ASSERT_TRUE(scan_root.CreateUniqueTempDir()); std::vector<base::FilePath> roots; diff --git a/tools/valgrind/gtest_exclude/cc_unittests.gtest-drmemory_win32.txt b/tools/valgrind/gtest_exclude/cc_unittests.gtest-drmemory_win32.txt index eb20f3a..95c0422 100644 --- a/tools/valgrind/gtest_exclude/cc_unittests.gtest-drmemory_win32.txt +++ b/tools/valgrind/gtest_exclude/cc_unittests.gtest-drmemory_win32.txt @@ -23,6 +23,3 @@ LayerTreeHostPictureTestRSLLMembershipWithScale.RunMultiThread_DirectRenderer_Im # https://crbug.com/486619 LayerTreeHostTestWillBeginImplFrameHasDidFinishImplFrame.RunSingleThread* - -# https://crbug.com/504051 -UIResourceLostBeforeCommit.RunMultiThread_DirectRenderer |