summaryrefslogtreecommitdiffstats
path: root/base/security_unittest.cc
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-16 15:32:33 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-16 15:32:33 +0000
commit6bc8b768412e242eabab85f74ebcb71a7d5a0e62 (patch)
treec1e14b5fd4856f79bf2608d66ffda0d9374a9d0c /base/security_unittest.cc
parent2c3223ede8e4c378d2c8af6a1e9735242fd00a8c (diff)
downloadchromium_src-6bc8b768412e242eabab85f74ebcb71a7d5a0e62.zip
chromium_src-6bc8b768412e242eabab85f74ebcb71a7d5a0e62.tar.gz
chromium_src-6bc8b768412e242eabab85f74ebcb71a7d5a0e62.tar.bz2
Enable SecurityTest.CallocOverflow under ASan on Mac.
BUG=175554 R=jln@chromium.org Review URL: https://codereview.chromium.org/15108007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200543 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/security_unittest.cc')
-rw-r--r--base/security_unittest.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/base/security_unittest.cc b/base/security_unittest.cc
index e6e22a0..4470a14 100644
--- a/base/security_unittest.cc
+++ b/base/security_unittest.cc
@@ -150,12 +150,6 @@ TEST(SecurityTest, TCMALLOC_TEST(MemoryAllocationRestrictionsNewArray)) {
#define DISABLE_ON_IOS_AND_WIN(function) function
#endif
-#if defined(ADDRESS_SANITIZER) && defined(OS_MACOSX)
- #define DISABLE_ON_MAC_WITH_ASAN(function) DISABLED_##function
-#else
- #define DISABLE_ON_MAC_WITH_ASAN(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.
@@ -216,7 +210,7 @@ bool CallocReturnsNull(size_t nmemb, size_t size) {
}
// Test if calloc() can overflow.
-TEST(SecurityTest, DISABLE_ON_MAC_WITH_ASAN(CallocOverflow)) {
+TEST(SecurityTest, CallocOverflow) {
const size_t kArraySize = 4096;
const size_t kMaxSizeT = numeric_limits<size_t>::max();
const size_t kArraySize2 = kMaxSizeT / kArraySize + 10;