diff options
| author | earthdok <earthdok@chromium.org> | 2015-03-25 07:16:10 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-25 14:16:48 +0000 |
| commit | 28307d55ab257422161f20c42cbdd693c39bcafb (patch) | |
| tree | bace9718ae025c51f973b7ae6dfadabd83d1abd0 | |
| parent | ff38f0272c5f1268a8b7387b18fe37689bd14332 (diff) | |
| download | chromium_src-28307d55ab257422161f20c42cbdd693c39bcafb.zip chromium_src-28307d55ab257422161f20c42cbdd693c39bcafb.tar.gz chromium_src-28307d55ab257422161f20c42cbdd693c39bcafb.tar.bz2 | |
[MemSheriff] Disable a flaky CrOS test under MSan.
BUG=468982
TBR=mtomasz@chromium.org
Review URL: https://codereview.chromium.org/1019393004
Cr-Commit-Position: refs/heads/master@{#322156}
| -rw-r--r-- | chrome/browser/chromeos/file_manager/file_manager_browsertest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc index b74efb3..8695e7a 100644 --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc @@ -1274,7 +1274,8 @@ IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, // Slow tests are disabled on debug build. http://crbug.com/327719 // Fails on official build. http://crbug.com/429294 -#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) +// Disabled under MSAN as well. http://crbug.com/468982. +#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER) #define MAYBE_PRE_BasicDrive DISABLED_PRE_BasicDrive #define MAYBE_BasicDrive DISABLED_BasicDrive #else |