diff options
| -rw-r--r-- | chrome/browser/chromeos/file_manager/file_manager_browsertest.cc | 67 |
1 files changed, 43 insertions, 24 deletions
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc index 8695e7a..793e992 100644 --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc @@ -820,7 +820,8 @@ IN_PROC_BROWSER_TEST_P(FileManagerBrowserTest, Test) { // 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/468980. +#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER) #define MAYBE_FileDisplay DISABLED_FileDisplay #else #define MAYBE_FileDisplay FileDisplay @@ -835,7 +836,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( // 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/468980. +#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER) #define MAYBE_OpenVideoFiles DISABLED_OpenVideoFiles #else #define MAYBE_OpenVideoFiles OpenVideoFiles @@ -849,7 +851,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( // 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/468980. +#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER) #define MAYBE_OpenAudioFiles DISABLED_OpenAudioFiles #else #define MAYBE_OpenAudioFiles OpenAudioFiles @@ -869,7 +872,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( // 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/468980. +#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER) #define MAYBE_OpenImageFiles DISABLED_OpenImageFiles #else #define MAYBE_OpenImageFiles OpenImageFiles @@ -882,7 +886,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( TestParameter(NOT_IN_GUEST_MODE, "imageOpenDrive"))); // Slow tests are disabled on debug build. http://crbug.com/327719 -#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) +// Disabled under MSAN as well. http://crbug.com/468980. +#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER) #define MAYBE_CreateNewFolder DISABLED_CreateNewFolder #else #define MAYBE_CreateNewFolder CreateNewFolder @@ -901,7 +906,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( // 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/468980. +#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER) #define MAYBE_KeyboardOperations DISABLED_KeyboardOperations #else #define MAYBE_KeyboardOperations KeyboardOperations @@ -928,7 +934,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( // 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/468980. +#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER) #define MAYBE_DriveSpecific DISABLED_DriveSpecific #else #define MAYBE_DriveSpecific DriveSpecific @@ -947,7 +954,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( // 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/468980. +#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER) #define MAYBE_Transfer DISABLED_Transfer #else #define MAYBE_Transfer Transfer @@ -967,7 +975,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( // 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/468980. +#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER) #define MAYBE_RestorePrefs DISABLED_RestorePrefs #else #define MAYBE_RestorePrefs RestorePrefs @@ -981,7 +990,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( TestParameter(NOT_IN_GUEST_MODE, "restoreCurrentView"))); // Slow tests are disabled on debug build. http://crbug.com/327719 -#if !defined(NDEBUG) +// Disabled under MSAN as well. http://crbug.com/468980. +#if !defined(NDEBUG) || defined(MEMORY_SANITIZER) #define MAYBE_ShareDialog DISABLED_ShareDialog #else #define MAYBE_ShareDialog ShareDialog @@ -993,7 +1003,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( TestParameter(NOT_IN_GUEST_MODE, "shareDirectory"))); // Slow tests are disabled on debug build. http://crbug.com/327719 -#if !defined(NDEBUG) +// Disabled under MSAN as well. http://crbug.com/468980. +#if !defined(NDEBUG) || defined(MEMORY_SANITIZER) #define MAYBE_RestoreGeometry DISABLED_RestoreGeometry #else #define MAYBE_RestoreGeometry RestoreGeometry @@ -1004,9 +1015,9 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "restoreGeometry"), TestParameter(IN_GUEST_MODE, "restoreGeometry"))); -// Slow tests are disabled on debug and msan build. -// http://crbug.com/327719, 457365 -#if !defined(NDEBUG) +// Slow tests are disabled on debug build. http://crbug.com/327719 +// Disabled under MSAN as well. http://crbug.com/468980. +#if !defined(NDEBUG) || defined(MEMORY_SANITIZER) #define MAYBE_Traverse DISABLED_Traverse #else #define MAYBE_Traverse Traverse @@ -1019,7 +1030,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( TestParameter(NOT_IN_GUEST_MODE, "traverseDrive"))); // Slow tests are disabled on debug build. http://crbug.com/327719 -#if !defined(NDEBUG) +// Disabled under MSAN as well. http://crbug.com/468980. +#if !defined(NDEBUG) || defined(MEMORY_SANITIZER) #define MAYBE_SuggestAppDialog DISABLED_SuggestAppDialog #else #define MAYBE_SuggestAppDialog SuggestAppDialog @@ -1030,7 +1042,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "suggestAppDialog"))); // Slow tests are disabled on debug build. http://crbug.com/327719 -#if !defined(NDEBUG) +// Disabled under MSAN as well. http://crbug.com/468980. +#if !defined(NDEBUG) || defined(MEMORY_SANITIZER) #define MAYBE_ExecuteDefaultTaskOnDownloads \ DISABLED_ExecuteDefaultTaskOnDownloads #else @@ -1044,7 +1057,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( TestParameter(IN_GUEST_MODE, "executeDefaultTaskOnDownloads"))); // Slow tests are disabled on debug build. http://crbug.com/327719 -#if !defined(NDEBUG) +// Disabled under MSAN as well. http://crbug.com/468980. +#if !defined(NDEBUG) || defined(MEMORY_SANITIZER) #define MAYBE_ExecuteDefaultTaskOnDrive DISABLED_ExecuteDefaultTaskOnDrive #else #define MAYBE_ExecuteDefaultTaskOnDrive ExecuteDefaultTaskOnDrive @@ -1056,7 +1070,8 @@ INSTANTIATE_TEST_CASE_P( TestParameter(NOT_IN_GUEST_MODE, "executeDefaultTaskOnDrive"))); // Slow tests are disabled on debug build. http://crbug.com/327719 -#if !defined(NDEBUG) +// Disabled under MSAN as well. http://crbug.com/468980. +#if !defined(NDEBUG) || defined(MEMORY_SANITIZER) #define MAYBE_DefaultActionDialog DISABLED_DefaultActionDialog #else #define MAYBE_DefaultActionDialog DefaultActionDialog @@ -1070,7 +1085,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( TestParameter(NOT_IN_GUEST_MODE, "defaultActionDialogOnDrive"))); // Slow tests are disabled on debug build. http://crbug.com/327719 -#if !defined(NDEBUG) +// Disabled under MSAN as well. http://crbug.com/468980. +#if !defined(NDEBUG) || defined(MEMORY_SANITIZER) #define MAYBE_GenericTask DISABLED_GenericTask #else #define MAYBE_GenericTask GenericTask @@ -1083,7 +1099,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( TestParameter(NOT_IN_GUEST_MODE, "genericAndNonGenericTasksAreMixed"))); // Slow tests are disabled on debug build. http://crbug.com/327719 -#if !defined(NDEBUG) +// Disabled under MSAN as well. http://crbug.com/468980. +#if !defined(NDEBUG) || defined(MEMORY_SANITIZER) #define MAYBE_FolderShortcuts DISABLED_FolderShortcuts #else #define MAYBE_FolderShortcuts FolderShortcuts @@ -1112,7 +1129,8 @@ INSTANTIATE_TEST_CASE_P( "tabindexFocusDirectorySelected"))); // Fails on official build. http://crbug.com/429294 -#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) +// Disabled under MSAN as well. http://crbug.com/468980. +#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER) #define MAYBE_OpenFileDialog DISABLED_OpenFileDialog #else #define MAYBE_OpenFileDialog OpenFileDialog @@ -1152,7 +1170,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( TestParameter(NOT_IN_GUEST_MODE, "copyBetweenWindowsUsbToLocal"))); // Slow tests are disabled on debug build. http://crbug.com/327719 -#if !defined(NDEBUG) +// Disabled under MSAN as well. http://crbug.com/468980. +#if !defined(NDEBUG) || defined(MEMORY_SANITIZER) #define MAYBE_ShowGridView DISABLED_ShowGridView #else #define MAYBE_ShowGridView ShowGridView @@ -1250,7 +1269,7 @@ class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase { // Slow tests are disabled on debug build. http://crbug.com/327719 // Fails on official build. http://crbug.com/429294 -// Disabled under MSAN as well. http://crbug.com/468982. +// Disabled under MSAN as well. http://crbug.com/468980. #if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER) #define MAYBE_PRE_BasicDownloads DISABLED_PRE_BasicDownloads #define MAYBE_BasicDownloads DISABLED_BasicDownloads @@ -1274,7 +1293,7 @@ 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 -// Disabled under MSAN as well. http://crbug.com/468982. +// Disabled under MSAN as well. http://crbug.com/468980. #if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER) #define MAYBE_PRE_BasicDrive DISABLED_PRE_BasicDrive #define MAYBE_BasicDrive DISABLED_BasicDrive |