| Index: base/process/memory_unittest.cc
|
| diff --git a/base/process/memory_unittest.cc b/base/process/memory_unittest.cc
|
| index 29e76dd2c8e20fad885551530f563b0d959174e3..0276b495915cc5d6d37ee3522da45608b2cac76a 100644
|
| --- a/base/process/memory_unittest.cc
|
| +++ b/base/process/memory_unittest.cc
|
| @@ -128,10 +128,11 @@ TEST(ProcessMemoryTest, MacTerminateOnHeapCorruption) {
|
|
|
| // Android doesn't implement set_new_handler, so we can't use the
|
| // OutOfMemoryTest cases. OpenBSD does not support these tests either.
|
| -// Don't test these on ASAN configurations: only test the real allocator.
|
| +// Don't test these on ASan/TSan/MSan configurations: only test the real
|
| +// allocator.
|
| // TODO(vandebo) make this work on Windows too.
|
| #if !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !defined(OS_WIN) && \
|
| - !defined(ADDRESS_SANITIZER)
|
| + !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
|
|
|
| #if defined(USE_TCMALLOC)
|
| extern "C" {
|
|
|