Commit bd35e6e9 authored by Noel Gordon's avatar Noel Gordon Committed by Commit Bot

Actually disable FilesApp ZipTests in DEBUG

defined(DEBUG) => !defined(NDEBUG)

Bug: 936429
Change-Id: I6b8b9402c32af0defd043bf20debf4ce417abe82
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1636995Reviewed-by: default avatarLuciano Pacheco <lucmult@chromium.org>
Commit-Queue: Noel Gordon <noel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#664692}
parent 247d30ac
...@@ -345,7 +345,7 @@ WRAPPED_INSTANTIATE_TEST_SUITE_P( ...@@ -345,7 +345,7 @@ WRAPPED_INSTANTIATE_TEST_SUITE_P(
// NaCl fails to compile zip plugin.pexe too often on ASAN, crbug.com/867738 // NaCl fails to compile zip plugin.pexe too often on ASAN, crbug.com/867738
// The tests are flaky on the debug bot and always time out first and then pass // The tests are flaky on the debug bot and always time out first and then pass
// on retry. Disabled for debug as per crbug.com/936429. // on retry. Disabled for debug as per crbug.com/936429.
#if defined(ADDRESS_SANITIZER) || defined(DEBUG) #if defined(ADDRESS_SANITIZER) || !defined(NDEBUG)
#define MAYBE_ZipFiles DISABLED_ZipFiles #define MAYBE_ZipFiles DISABLED_ZipFiles
#else #else
#define MAYBE_ZipFiles ZipFiles #define MAYBE_ZipFiles ZipFiles
...@@ -358,11 +358,7 @@ WRAPPED_INSTANTIATE_TEST_SUITE_P( ...@@ -358,11 +358,7 @@ WRAPPED_INSTANTIATE_TEST_SUITE_P(
ZipCase("zipFileOpenDownloadsShiftJIS"), ZipCase("zipFileOpenDownloadsShiftJIS"),
ZipCase("zipFileOpenDownloadsMacOs"), ZipCase("zipFileOpenDownloadsMacOs"),
ZipCase("zipFileOpenDownloadsWithAbsolutePaths"), ZipCase("zipFileOpenDownloadsWithAbsolutePaths"),
// Disable the test in debug mode. In debug mode, the test run time is very
// close to, and often exceeds the 45 second test timeout.
#if defined(NDEBUG)
ZipCase("zipFileOpenDownloadsEncryptedCancelPassphrase"), ZipCase("zipFileOpenDownloadsEncryptedCancelPassphrase"),
#endif
ZipCase("zipFileOpenDrive").DisableDriveFs(), ZipCase("zipFileOpenDrive").DisableDriveFs(),
ZipCase("zipFileOpenDrive").EnableDriveFs(), ZipCase("zipFileOpenDrive").EnableDriveFs(),
ZipCase("zipFileOpenUsb"), ZipCase("zipFileOpenUsb"),
......
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