diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-24 08:57:19 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-24 08:57:19 +0000 |
| commit | e877a06f4cd92d50ff2832fa7ffff98569398e98 (patch) | |
| tree | 5de9de86312e6351fcd5861643933f015c5fa6de /base/security_unittest.cc | |
| parent | 3054d6ba28d587eadee7ddfce54261bab755f8a4 (diff) | |
| download | chromium_src-e877a06f4cd92d50ff2832fa7ffff98569398e98.zip chromium_src-e877a06f4cd92d50ff2832fa7ffff98569398e98.tar.gz chromium_src-e877a06f4cd92d50ff2832fa7ffff98569398e98.tar.bz2 | |
Disable SecurityTest.NewOverflow under ThreadSanitizer v2
BUG=310631
TBR=jln@chromium.org
Review URL: https://codereview.chromium.org/38753005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230684 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/security_unittest.cc')
| -rw-r--r-- | base/security_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/base/security_unittest.cc b/base/security_unittest.cc index 8f59219..1c24fad 100644 --- a/base/security_unittest.cc +++ b/base/security_unittest.cc @@ -147,10 +147,10 @@ TEST(SecurityTest, TCMALLOC_TEST(MemoryAllocationRestrictionsNewArray)) { // The tests bellow check for overflows in new[] and calloc(). -#if defined(OS_IOS) || defined(OS_WIN) - #define DISABLE_ON_IOS_AND_WIN(function) DISABLED_##function +#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(function) function + #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 @@ -174,7 +174,7 @@ void OverflowTestsSoftExpectTrue(bool overflow_detected) { // 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(NewOverflow)) { +TEST(SecurityTest, DISABLE_ON_IOS_AND_WIN_AND_TSAN(NewOverflow)) { const size_t kArraySize = 4096; // We want something "dynamic" here, so that the compiler doesn't // immediately reject crazy arrays. |