Commit 975a2724 authored by yoshiki's avatar yoshiki Committed by Commit bot

[Files.app] disable slow tests on Debug build, ASAN, MSAN, TSAN bots as a whole

The all slow tests have a possibility to be failed on slow bots (Debug build, ASAN, MSAN, TSAN bots). So this patch disabled them as a whole by defining DISABLE_SLOW_FILESPAPP_TEST macro.

BUG=none
TEST=run Debug, ASAN, MSAN, TSAN bots

Review URL: https://codereview.chromium.org/1139823003

Cr-Commit-Position: refs/heads/master@{#329815}
parent 31a6cb0e
...@@ -58,6 +58,13 @@ ...@@ -58,6 +58,13 @@
#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/embedded_test_server.h"
#include "storage/browser/fileapi/external_mount_points.h" #include "storage/browser/fileapi/external_mount_points.h"
// Slow tests are disabled on debug build. http://crbug.com/327719
// Disabled under MSAN, ASAN, and LSAN as well. http://crbug.com/468980.
#if !defined(NDEBUG) || defined(MEMORY_SANITIZER) || \
defined(ADDRESS_SANITIZER) || defined(LEAK_SANITIZER)
#define DISABLE_SLOW_FILESAPP_TESTS
#endif
using drive::DriveIntegrationServiceFactory; using drive::DriveIntegrationServiceFactory;
namespace file_manager { namespace file_manager {
...@@ -816,10 +823,8 @@ IN_PROC_BROWSER_TEST_P(FileManagerBrowserTest, Test) { ...@@ -816,10 +823,8 @@ IN_PROC_BROWSER_TEST_P(FileManagerBrowserTest, Test) {
#define WRAPPED_INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator) \ #define WRAPPED_INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator) \
INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator) INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator)
// Slow tests are disabled on debug build. http://crbug.com/327719
// Fails on official build. http://crbug.com/429294 // Fails on official build. http://crbug.com/429294
// Disabled under MSAN as well. http://crbug.com/468980. #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER)
#define MAYBE_FileDisplay DISABLED_FileDisplay #define MAYBE_FileDisplay DISABLED_FileDisplay
#else #else
#define MAYBE_FileDisplay FileDisplay #define MAYBE_FileDisplay FileDisplay
...@@ -835,10 +840,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -835,10 +840,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestParameter(NOT_IN_GUEST_MODE, "searchCaseInsensitive"), TestParameter(NOT_IN_GUEST_MODE, "searchCaseInsensitive"),
TestParameter(NOT_IN_GUEST_MODE, "searchNotFound"))); TestParameter(NOT_IN_GUEST_MODE, "searchNotFound")));
// Slow tests are disabled on debug build. http://crbug.com/327719
// Fails on official build. http://crbug.com/429294 // Fails on official build. http://crbug.com/429294
// Disabled under MSAN as well. http://crbug.com/468980. #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER)
#define MAYBE_OpenVideoFiles DISABLED_OpenVideoFiles #define MAYBE_OpenVideoFiles DISABLED_OpenVideoFiles
#else #else
#define MAYBE_OpenVideoFiles OpenVideoFiles #define MAYBE_OpenVideoFiles OpenVideoFiles
...@@ -850,12 +853,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -850,12 +853,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestParameter(NOT_IN_GUEST_MODE, "videoOpenDownloads"), TestParameter(NOT_IN_GUEST_MODE, "videoOpenDownloads"),
TestParameter(NOT_IN_GUEST_MODE, "videoOpenDrive"))); TestParameter(NOT_IN_GUEST_MODE, "videoOpenDrive")));
// Slow tests are disabled on debug build. http://crbug.com/327719
// Fails on official build. http://crbug.com/429294 // Fails on official build. http://crbug.com/429294
// Disabled under MSAN, ASAN, and LSAN as well. http://crbug.com/468980. #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || \
defined(MEMORY_SANITIZER) || defined(ADDRESS_SANITIZER) || \
defined(LEAK_SANITIZER)
#define MAYBE_OpenAudioFiles DISABLED_OpenAudioFiles #define MAYBE_OpenAudioFiles DISABLED_OpenAudioFiles
#else #else
#define MAYBE_OpenAudioFiles OpenAudioFiles #define MAYBE_OpenAudioFiles OpenAudioFiles
...@@ -873,12 +872,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -873,12 +872,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestParameter(NOT_IN_GUEST_MODE, "audioRepeatMultipleFileDrive"), TestParameter(NOT_IN_GUEST_MODE, "audioRepeatMultipleFileDrive"),
TestParameter(NOT_IN_GUEST_MODE, "audioNoRepeatMultipleFileDrive"))); TestParameter(NOT_IN_GUEST_MODE, "audioNoRepeatMultipleFileDrive")));
// Slow tests are disabled on debug build. http://crbug.com/327719
// Fails on official build. http://crbug.com/429294 // Fails on official build. http://crbug.com/429294
// Disabled under MSAN, ASAN, and LSAN as well. http://crbug.com/468980. #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || \
defined(MEMORY_SANITIZER) || defined(ADDRESS_SANITIZER) || \
defined(LEAK_SANITIZER)
#define MAYBE_OpenImageFiles DISABLED_OpenImageFiles #define MAYBE_OpenImageFiles DISABLED_OpenImageFiles
#else #else
#define MAYBE_OpenImageFiles OpenImageFiles #define MAYBE_OpenImageFiles OpenImageFiles
...@@ -890,9 +885,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -890,9 +885,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestParameter(NOT_IN_GUEST_MODE, "imageOpenDownloads"), TestParameter(NOT_IN_GUEST_MODE, "imageOpenDownloads"),
TestParameter(NOT_IN_GUEST_MODE, "imageOpenDrive"))); TestParameter(NOT_IN_GUEST_MODE, "imageOpenDrive")));
// Slow tests are disabled on debug build. http://crbug.com/327719 #if defined(DISABLE_SLOW_FILESAPP_TESTS) || 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 #define MAYBE_CreateNewFolder DISABLED_CreateNewFolder
#else #else
#define MAYBE_CreateNewFolder CreateNewFolder #define MAYBE_CreateNewFolder CreateNewFolder
...@@ -909,10 +902,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -909,10 +902,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestParameter(NOT_IN_GUEST_MODE, TestParameter(NOT_IN_GUEST_MODE,
"createNewFolderDrive"))); "createNewFolderDrive")));
// Slow tests are disabled on debug build. http://crbug.com/327719
// Fails on official build. http://crbug.com/429294 // Fails on official build. http://crbug.com/429294
// Disabled under MSAN as well. http://crbug.com/468980. #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER)
#define MAYBE_KeyboardOperations DISABLED_KeyboardOperations #define MAYBE_KeyboardOperations DISABLED_KeyboardOperations
#else #else
#define MAYBE_KeyboardOperations KeyboardOperations #define MAYBE_KeyboardOperations KeyboardOperations
...@@ -937,12 +928,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -937,12 +928,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestParameter(NOT_IN_GUEST_MODE, TestParameter(NOT_IN_GUEST_MODE,
"renameNewDirectoryDrive"))); "renameNewDirectoryDrive")));
// Slow tests are disabled on debug build. http://crbug.com/327719
// Fails on official build. http://crbug.com/429294 // Fails on official build. http://crbug.com/429294
// Disabled under MSAN, ASAN, and LSAN as well. http://crbug.com/468980. #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || \
defined(MEMORY_SANITIZER) || defined(ADDRESS_SANITIZER) || \
defined(LEAK_SANITIZER)
#define MAYBE_DriveSpecific DISABLED_DriveSpecific #define MAYBE_DriveSpecific DISABLED_DriveSpecific
#else #else
#define MAYBE_DriveSpecific DriveSpecific #define MAYBE_DriveSpecific DriveSpecific
...@@ -959,12 +946,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -959,12 +946,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestParameter(NOT_IN_GUEST_MODE, "clickFirstSearchResult"), TestParameter(NOT_IN_GUEST_MODE, "clickFirstSearchResult"),
TestParameter(NOT_IN_GUEST_MODE, "pressEnterToSearch"))); TestParameter(NOT_IN_GUEST_MODE, "pressEnterToSearch")));
// Slow tests are disabled on debug build. http://crbug.com/327719
// Fails on official build. http://crbug.com/429294 // Fails on official build. http://crbug.com/429294
// Disabled under MSAN, ASAN, and LSAN as well. http://crbug.com/468980. #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || \
defined(MEMORY_SANITIZER) || defined(ADDRESS_SANITIZER) || \
defined(LEAK_SANITIZER)
#define MAYBE_Transfer DISABLED_Transfer #define MAYBE_Transfer DISABLED_Transfer
#else #else
#define MAYBE_Transfer Transfer #define MAYBE_Transfer Transfer
...@@ -982,10 +965,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -982,10 +965,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestParameter(NOT_IN_GUEST_MODE, "transferFromOfflineToDownloads"), TestParameter(NOT_IN_GUEST_MODE, "transferFromOfflineToDownloads"),
TestParameter(NOT_IN_GUEST_MODE, "transferFromOfflineToDrive"))); TestParameter(NOT_IN_GUEST_MODE, "transferFromOfflineToDrive")));
// Slow tests are disabled on debug build. http://crbug.com/327719
// Fails on official build. http://crbug.com/429294 // Fails on official build. http://crbug.com/429294
// Disabled under MSAN as well. http://crbug.com/468980. #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER)
#define MAYBE_RestorePrefs DISABLED_RestorePrefs #define MAYBE_RestorePrefs DISABLED_RestorePrefs
#else #else
#define MAYBE_RestorePrefs RestorePrefs #define MAYBE_RestorePrefs RestorePrefs
...@@ -998,10 +979,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -998,10 +979,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestParameter(IN_GUEST_MODE, "restoreCurrentView"), TestParameter(IN_GUEST_MODE, "restoreCurrentView"),
TestParameter(NOT_IN_GUEST_MODE, "restoreCurrentView"))); TestParameter(NOT_IN_GUEST_MODE, "restoreCurrentView")));
// Slow tests are disabled on debug build. http://crbug.com/327719 #if defined(DISABLE_SLOW_FILESAPP_TESTS)
// Disabled under MSAN, ASAN, and LSAN as well. http://crbug.com/468980.
#if !defined(NDEBUG) || defined(MEMORY_SANITIZER) || \
defined(ADDRESS_SANITIZER) || defined(LEAK_SANITIZER)
#define MAYBE_ShareDialog DISABLED_ShareDialog #define MAYBE_ShareDialog DISABLED_ShareDialog
#else #else
#define MAYBE_ShareDialog ShareDialog #define MAYBE_ShareDialog ShareDialog
...@@ -1012,9 +990,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -1012,9 +990,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "shareFile"), ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "shareFile"),
TestParameter(NOT_IN_GUEST_MODE, "shareDirectory"))); TestParameter(NOT_IN_GUEST_MODE, "shareDirectory")));
// Slow tests are disabled on debug build. http://crbug.com/327719 #if defined(DISABLE_SLOW_FILESAPP_TESTS)
// Disabled under MSAN as well. http://crbug.com/468980.
#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
#define MAYBE_RestoreGeometry DISABLED_RestoreGeometry #define MAYBE_RestoreGeometry DISABLED_RestoreGeometry
#else #else
#define MAYBE_RestoreGeometry RestoreGeometry #define MAYBE_RestoreGeometry RestoreGeometry
...@@ -1025,9 +1001,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -1025,9 +1001,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "restoreGeometry"), ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "restoreGeometry"),
TestParameter(IN_GUEST_MODE, "restoreGeometry"))); TestParameter(IN_GUEST_MODE, "restoreGeometry")));
// Slow tests are disabled on debug build. http://crbug.com/327719 #if defined(DISABLE_SLOW_FILESAPP_TESTS)
// Disabled under MSAN as well. http://crbug.com/468980.
#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
#define MAYBE_Traverse DISABLED_Traverse #define MAYBE_Traverse DISABLED_Traverse
#else #else
#define MAYBE_Traverse Traverse #define MAYBE_Traverse Traverse
...@@ -1039,9 +1013,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -1039,9 +1013,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestParameter(NOT_IN_GUEST_MODE, "traverseDownloads"), TestParameter(NOT_IN_GUEST_MODE, "traverseDownloads"),
TestParameter(NOT_IN_GUEST_MODE, "traverseDrive"))); TestParameter(NOT_IN_GUEST_MODE, "traverseDrive")));
// Slow tests are disabled on debug build. http://crbug.com/327719 #if defined(DISABLE_SLOW_FILESAPP_TESTS)
// Disabled under MSAN as well. http://crbug.com/468980.
#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
#define MAYBE_SuggestAppDialog DISABLED_SuggestAppDialog #define MAYBE_SuggestAppDialog DISABLED_SuggestAppDialog
#else #else
#define MAYBE_SuggestAppDialog SuggestAppDialog #define MAYBE_SuggestAppDialog SuggestAppDialog
...@@ -1051,9 +1023,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -1051,9 +1023,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
FileManagerBrowserTest, FileManagerBrowserTest,
::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "suggestAppDialog"))); ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "suggestAppDialog")));
// Slow tests are disabled on debug build. http://crbug.com/327719 #if defined(DISABLE_SLOW_FILESAPP_TESTS)
// Disabled under MSAN as well. http://crbug.com/468980.
#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
#define MAYBE_ExecuteDefaultTaskOnDownloads \ #define MAYBE_ExecuteDefaultTaskOnDownloads \
DISABLED_ExecuteDefaultTaskOnDownloads DISABLED_ExecuteDefaultTaskOnDownloads
#else #else
...@@ -1066,9 +1036,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -1066,9 +1036,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestParameter(NOT_IN_GUEST_MODE, "executeDefaultTaskOnDownloads"), TestParameter(NOT_IN_GUEST_MODE, "executeDefaultTaskOnDownloads"),
TestParameter(IN_GUEST_MODE, "executeDefaultTaskOnDownloads"))); TestParameter(IN_GUEST_MODE, "executeDefaultTaskOnDownloads")));
// Slow tests are disabled on debug build. http://crbug.com/327719 #if defined(DISABLE_SLOW_FILESAPP_TESTS)
// Disabled under MSAN as well. http://crbug.com/468980.
#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
#define MAYBE_ExecuteDefaultTaskOnDrive DISABLED_ExecuteDefaultTaskOnDrive #define MAYBE_ExecuteDefaultTaskOnDrive DISABLED_ExecuteDefaultTaskOnDrive
#else #else
#define MAYBE_ExecuteDefaultTaskOnDrive ExecuteDefaultTaskOnDrive #define MAYBE_ExecuteDefaultTaskOnDrive ExecuteDefaultTaskOnDrive
...@@ -1079,9 +1047,7 @@ INSTANTIATE_TEST_CASE_P( ...@@ -1079,9 +1047,7 @@ INSTANTIATE_TEST_CASE_P(
::testing::Values( ::testing::Values(
TestParameter(NOT_IN_GUEST_MODE, "executeDefaultTaskOnDrive"))); TestParameter(NOT_IN_GUEST_MODE, "executeDefaultTaskOnDrive")));
// Slow tests are disabled on debug build. http://crbug.com/327719 #if defined(DISABLE_SLOW_FILESAPP_TESTS)
// Disabled under MSAN as well. http://crbug.com/468980.
#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
#define MAYBE_DefaultActionDialog DISABLED_DefaultActionDialog #define MAYBE_DefaultActionDialog DISABLED_DefaultActionDialog
#else #else
#define MAYBE_DefaultActionDialog DefaultActionDialog #define MAYBE_DefaultActionDialog DefaultActionDialog
...@@ -1094,9 +1060,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -1094,9 +1060,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestParameter(IN_GUEST_MODE, "defaultActionDialogOnDownloads"), TestParameter(IN_GUEST_MODE, "defaultActionDialogOnDownloads"),
TestParameter(NOT_IN_GUEST_MODE, "defaultActionDialogOnDrive"))); TestParameter(NOT_IN_GUEST_MODE, "defaultActionDialogOnDrive")));
// Slow tests are disabled on debug build. http://crbug.com/327719 #if defined(DISABLE_SLOW_FILESAPP_TESTS)
// Disabled under MSAN as well. http://crbug.com/468980.
#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
#define MAYBE_GenericTask DISABLED_GenericTask #define MAYBE_GenericTask DISABLED_GenericTask
#else #else
#define MAYBE_GenericTask GenericTask #define MAYBE_GenericTask GenericTask
...@@ -1108,9 +1072,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -1108,9 +1072,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestParameter(NOT_IN_GUEST_MODE, "genericTaskIsNotExecuted"), TestParameter(NOT_IN_GUEST_MODE, "genericTaskIsNotExecuted"),
TestParameter(NOT_IN_GUEST_MODE, "genericAndNonGenericTasksAreMixed"))); TestParameter(NOT_IN_GUEST_MODE, "genericAndNonGenericTasksAreMixed")));
// Slow tests are disabled on debug build. http://crbug.com/327719 #if defined(DISABLE_SLOW_FILESAPP_TESTS)
// Disabled under MSAN as well. http://crbug.com/468980.
#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
#define MAYBE_FolderShortcuts DISABLED_FolderShortcuts #define MAYBE_FolderShortcuts DISABLED_FolderShortcuts
#else #else
#define MAYBE_FolderShortcuts FolderShortcuts #define MAYBE_FolderShortcuts FolderShortcuts
...@@ -1122,10 +1084,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -1122,10 +1084,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestParameter(NOT_IN_GUEST_MODE, "traverseFolderShortcuts"), TestParameter(NOT_IN_GUEST_MODE, "traverseFolderShortcuts"),
TestParameter(NOT_IN_GUEST_MODE, "addRemoveFolderShortcuts"))); TestParameter(NOT_IN_GUEST_MODE, "addRemoveFolderShortcuts")));
// Slow tests are disabled on debug build. http://crbug.com/327719
// Fails on official build. http://crbug.com/429294 // Fails on official build. http://crbug.com/429294
// Disabled under MSAN as well. http://crbug.com/468980. #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER)
#define MAYBE_SortColumns DISABLED_SortColumns #define MAYBE_SortColumns DISABLED_SortColumns
#else #else
#define MAYBE_SortColumns SortColumns #define MAYBE_SortColumns SortColumns
...@@ -1141,10 +1101,15 @@ INSTANTIATE_TEST_CASE_P( ...@@ -1141,10 +1101,15 @@ INSTANTIATE_TEST_CASE_P(
FileManagerBrowserTest, FileManagerBrowserTest,
::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "searchBoxFocus"))); ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "searchBoxFocus")));
INSTANTIATE_TEST_CASE_P(TabindexFocus, #if defined(DISABLE_SLOW_FILESAPP_TESTS)
FileManagerBrowserTest, #define MAYBE_TabindexFocus DISABLED_TabindexFocus
::testing::Values(TestParameter(NOT_IN_GUEST_MODE, #else
"tabindexFocus"))); #define MAYBE_TabindexFocus TabindexFocus
#endif
WRAPPED_INSTANTIATE_TEST_CASE_P(
MAYBE_TabindexFocus,
FileManagerBrowserTest,
::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "tabindexFocus")));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P(
TabindexFocusDownloads, TabindexFocusDownloads,
...@@ -1153,9 +1118,7 @@ INSTANTIATE_TEST_CASE_P( ...@@ -1153,9 +1118,7 @@ INSTANTIATE_TEST_CASE_P(
"tabindexFocusDownloads"), "tabindexFocusDownloads"),
TestParameter(IN_GUEST_MODE, "tabindexFocusDownloads"))); TestParameter(IN_GUEST_MODE, "tabindexFocusDownloads")));
// Slow tests are disabled on debug build. http://crbug.com/327719 #if defined(DISABLE_SLOW_FILESAPP_TESTS)
// Disabled under MSAN as well. http://crbug.com/468980.
#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
#define MAYBE_TabindexFocusDirectorySelected \ #define MAYBE_TabindexFocusDirectorySelected \
DISABLED_TabindexFocusDirectorySelected DISABLED_TabindexFocusDirectorySelected
#else #else
...@@ -1189,9 +1152,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -1189,9 +1152,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestParameter(NOT_IN_GUEST_MODE, "tabindexSaveFileDialogDownloads"), TestParameter(NOT_IN_GUEST_MODE, "tabindexSaveFileDialogDownloads"),
TestParameter(IN_GUEST_MODE, "tabindexSaveFileDialogDownloads"))); TestParameter(IN_GUEST_MODE, "tabindexSaveFileDialogDownloads")));
// Fails on official build. http://crbug.com/429294 #if defined(DISABLE_SLOW_FILESAPP_TESTS) || 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 #define MAYBE_OpenFileDialog DISABLED_OpenFileDialog
#else #else
#define MAYBE_OpenFileDialog OpenFileDialog #define MAYBE_OpenFileDialog OpenFileDialog
...@@ -1212,9 +1173,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -1212,9 +1173,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestParameter(NOT_IN_GUEST_MODE, TestParameter(NOT_IN_GUEST_MODE,
"unloadFileDialog"))); "unloadFileDialog")));
// Slow tests are disabled on debug build. http://crbug.com/327719 #if defined(DISABLE_SLOW_FILESAPP_TESTS)
// Disabled under MSAN as well. http://crbug.com/468980.
#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
#define MAYBE_CopyBetweenWindows DISABLED_CopyBetweenWindows #define MAYBE_CopyBetweenWindows DISABLED_CopyBetweenWindows
#else #else
#define MAYBE_CopyBetweenWindows CopyBetweenWindows #define MAYBE_CopyBetweenWindows CopyBetweenWindows
...@@ -1230,9 +1189,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -1230,9 +1189,7 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
TestParameter(NOT_IN_GUEST_MODE, "copyBetweenWindowsDriveToUsb"), TestParameter(NOT_IN_GUEST_MODE, "copyBetweenWindowsDriveToUsb"),
TestParameter(NOT_IN_GUEST_MODE, "copyBetweenWindowsUsbToLocal"))); TestParameter(NOT_IN_GUEST_MODE, "copyBetweenWindowsUsbToLocal")));
// Slow tests are disabled on debug build. http://crbug.com/327719 #if defined(DISABLE_SLOW_FILESAPP_TESTS)
// Disabled under MSAN as well. http://crbug.com/468980.
#if !defined(NDEBUG) || defined(MEMORY_SANITIZER)
#define MAYBE_ShowGridView DISABLED_ShowGridView #define MAYBE_ShowGridView DISABLED_ShowGridView
#else #else
#define MAYBE_ShowGridView ShowGridView #define MAYBE_ShowGridView ShowGridView
...@@ -1329,10 +1286,8 @@ class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase { ...@@ -1329,10 +1286,8 @@ class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase {
std::string test_case_name_; std::string test_case_name_;
}; };
// Slow tests are disabled on debug build. http://crbug.com/327719
// Fails on official build. http://crbug.com/429294 // Fails on official build. http://crbug.com/429294
// Disabled under MSAN as well. http://crbug.com/468980. #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER)
#define MAYBE_PRE_BasicDownloads DISABLED_PRE_BasicDownloads #define MAYBE_PRE_BasicDownloads DISABLED_PRE_BasicDownloads
#define MAYBE_BasicDownloads DISABLED_BasicDownloads #define MAYBE_BasicDownloads DISABLED_BasicDownloads
#else #else
...@@ -1353,10 +1308,8 @@ IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, ...@@ -1353,10 +1308,8 @@ IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest,
StartTest(); StartTest();
} }
// Slow tests are disabled on debug build. http://crbug.com/327719
// Fails on official build. http://crbug.com/429294 // Fails on official build. http://crbug.com/429294
// Disabled under MSAN as well. http://crbug.com/468980. #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
#if !defined(NDEBUG) || defined(OFFICIAL_BUILD) || defined(MEMORY_SANITIZER)
#define MAYBE_PRE_BasicDrive DISABLED_PRE_BasicDrive #define MAYBE_PRE_BasicDrive DISABLED_PRE_BasicDrive
#define MAYBE_BasicDrive DISABLED_BasicDrive #define MAYBE_BasicDrive DISABLED_BasicDrive
#else #else
...@@ -1412,7 +1365,12 @@ IN_PROC_BROWSER_TEST_F(GalleryBrowserTestInGuestMode, ...@@ -1412,7 +1365,12 @@ IN_PROC_BROWSER_TEST_F(GalleryBrowserTestInGuestMode,
StartTest(); StartTest();
} }
IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, OpenSingleImageOnDrive) { #if defined(DISABLE_SLOW_FILESAPP_TESTS)
#define MAYBE_OpenSingleImageOnDrive DISABLED_OpenSingleImageOnDrive
#else
#define MAYBE_OpenSingleImageOnDrive OpenSingleImageOnDrive
#endif
IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, MAYBE_OpenSingleImageOnDrive) {
set_test_case_name("openSingleImageOnDrive"); set_test_case_name("openSingleImageOnDrive");
StartTest(); StartTest();
} }
...@@ -1460,7 +1418,12 @@ IN_PROC_BROWSER_TEST_F(GalleryBrowserTestInGuestMode, ...@@ -1460,7 +1418,12 @@ IN_PROC_BROWSER_TEST_F(GalleryBrowserTestInGuestMode,
StartTest(); StartTest();
} }
IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, RenameImageOnDrive) { #if defined(DISABLE_SLOW_FILESAPP_TESTS)
#define MAYBE_RenameImageOnDrive DISABLED_RenameImageOnDrive
#else
#define MAYBE_RenameImageOnDrive RenameImageOnDrive
#endif
IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, MAYBE_RenameImageOnDrive) {
set_test_case_name("renameImageOnDrive"); set_test_case_name("renameImageOnDrive");
StartTest(); StartTest();
} }
...@@ -1497,7 +1460,12 @@ IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, RotateImageOnDrive) { ...@@ -1497,7 +1460,12 @@ IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, RotateImageOnDrive) {
StartTest(); StartTest();
} }
IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, CropImageOnDownloads) { #if defined(DISABLE_SLOW_FILESAPP_TESTS)
#define MAYBE_CropImageOnDownloads DISABLED_CropImageOnDownloads
#else
#define MAYBE_CropImageOnDownloads CropImageOnDownloads
#endif
IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, MAYBE_CropImageOnDownloads) {
set_test_case_name("cropImageOnDownloads"); set_test_case_name("cropImageOnDownloads");
StartTest(); StartTest();
} }
...@@ -1513,7 +1481,12 @@ IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, CropImageOnDrive) { ...@@ -1513,7 +1481,12 @@ IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, CropImageOnDrive) {
StartTest(); StartTest();
} }
IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, ExposureImageOnDownloads) { #if defined(DISABLE_SLOW_FILESAPP_TESTS)
#define MAYBE_ExposureImageOnDownloads DISABLED_ExposureImageOnDownloads
#else
#define MAYBE_ExposureImageOnDownloads ExposureImageOnDownloads
#endif
IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, MAYBE_ExposureImageOnDownloads) {
set_test_case_name("exposureImageOnDownloads"); set_test_case_name("exposureImageOnDownloads");
StartTest(); StartTest();
} }
......
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