From f024242c4d82e8594eade3ce26e6b5d1fdfa092b Mon Sep 17 00:00:00 2001 From: "glider@chromium.org" Date: Mon, 27 May 2013 15:23:57 +0000 Subject: Disable the OOM tests under ThreadSanitizer v2 as well as ASan. BUG=128314 R=mark@chromium.org Review URL: https://codereview.chromium.org/15722004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202433 0039d316-1c4b-4281-b951-d872f2087c98 --- base/process_util_unittest.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'base') diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc index 3ce9942..2d286ca 100644 --- a/base/process_util_unittest.cc +++ b/base/process_util_unittest.cc @@ -1069,12 +1069,13 @@ MULTIPROCESS_TEST_MAIN(process_util_test_die_immediately) { // Android doesn't implement set_new_handler, so we can't use the // OutOfMemoryTest cases. // OpenBSD does not support these tests either. -// AddressSanitizer defines the malloc()/free()/etc. functions so that they -// don't crash if the program is out of memory, so the OOM tests aren't supposed -// to work. +// AddressSanitizer and ThreadSanitizer define the malloc()/free()/etc. +// functions so that they don't crash if the program is out of memory, so the +// OOM tests aren't supposed to work. // TODO(vandebo) make this work on Windows too. #if !defined(OS_ANDROID) && !defined(OS_OPENBSD) && \ - !defined(OS_WIN) && !defined(ADDRESS_SANITIZER) + !defined(OS_WIN) && \ + !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) #if defined(USE_TCMALLOC) extern "C" { -- cgit v1.1