diff options
| author | John Abd-El-Malek <jam@chromium.org> | 2014-10-02 15:55:15 -0700 |
|---|---|---|
| committer | John Abd-El-Malek <jam@chromium.org> | 2014-10-02 22:56:18 +0000 |
| commit | 17727ff3110d0de81c938c69c4b7b8509563a8f9 (patch) | |
| tree | 1d68ff3d2e5aa8c076770526a869941766f54b72 /base/security_unittest.cc | |
| parent | be6357371938cb811880766c94768e534023db29 (diff) | |
| download | chromium_src-17727ff3110d0de81c938c69c4b7b8509563a8f9.zip chromium_src-17727ff3110d0de81c938c69c4b7b8509563a8f9.tar.gz chromium_src-17727ff3110d0de81c938c69c4b7b8509563a8f9.tar.bz2 | |
Disable SecurityTest.NewOverflow as it fails on 10.8
BUG=227092
TBR=meacer@chromium.org
Review URL: https://codereview.chromium.org/603793003
Cr-Commit-Position: refs/heads/master@{#297938}
Diffstat (limited to 'base/security_unittest.cc')
| -rw-r--r-- | base/security_unittest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/base/security_unittest.cc b/base/security_unittest.cc index 0ecaec4..a6d3480 100644 --- a/base/security_unittest.cc +++ b/base/security_unittest.cc @@ -149,12 +149,6 @@ TEST(SecurityTest, TCMALLOC_TEST(MemoryAllocationRestrictionsNewArray)) { // The tests bellow check for overflows in new[] and calloc(). -#if defined(OS_IOS) || defined(OS_WIN) || defined(THREAD_SANITIZER) - #define DISABLE_ON_IOS_AND_WIN_AND_TSAN(function) DISABLED_##function -#else - #define DISABLE_ON_IOS_AND_WIN_AND_TSAN(function) function -#endif - // There are platforms where these tests are known to fail. We would like to // be able to easily check the status on the bots, but marking tests as // FAILS_ is too clunky. @@ -173,10 +167,16 @@ void OverflowTestsSoftExpectTrue(bool overflow_detected) { } } +#if defined(OS_IOS) || defined(OS_WIN) || defined(THREAD_SANITIZER) || defined(OS_MACOSX) +#define MAYBE_NewOverflow DISABLED_NewOverflow +#else +#define MAYBE_NewOverflow NewOverflow +#endif // Test array[TooBig][X] and array[X][TooBig] allocations for int overflows. // IOS doesn't honor nothrow, so disable the test there. // Crashes on Windows Dbg builds, disable there as well. -TEST(SecurityTest, DISABLE_ON_IOS_AND_WIN_AND_TSAN(NewOverflow)) { +// Fails on Mac 10.8 http://crbug.com/227092 +TEST(SecurityTest, MAYBE_NewOverflow) { const size_t kArraySize = 4096; // We want something "dynamic" here, so that the compiler doesn't // immediately reject crazy arrays. |