diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 15:19:04 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 15:19:04 +0000 |
| commit | 6c4cbe241bec84bfe9f74a2ad977453546c2c1c5 (patch) | |
| tree | 10dfcd94620693050d4e10679604725c5c3a5ad3 /base/process_util_unittest.cc | |
| parent | d7ddea3a22b53bcdb5c80a1e45c6143ae3933448 (diff) | |
| download | chromium_src-6c4cbe241bec84bfe9f74a2ad977453546c2c1c5.zip chromium_src-6c4cbe241bec84bfe9f74a2ad977453546c2c1c5.tar.gz chromium_src-6c4cbe241bec84bfe9f74a2ad977453546c2c1c5.tar.bz2 | |
Remove the nested #ifdef ADDRESS_SANITIZER
Review URL: http://codereview.chromium.org/9007010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115130 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process_util_unittest.cc')
| -rw-r--r-- | base/process_util_unittest.cc | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc index a2c9740..36d48b6 100644 --- a/base/process_util_unittest.cc +++ b/base/process_util_unittest.cc @@ -880,8 +880,15 @@ MULTIPROCESS_TEST_MAIN(process_util_test_die_immediately) { #endif // defined(OS_POSIX) +// 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. // TODO(vandebo) make this work on Windows too. -#if !defined(OS_WIN) +#if !defined(OS_ANDROID) && !defined(OS_OPENBSD) && \ + !defined(OS_WIN) && !defined(ADDRESS_SANITIZER) #if defined(USE_TCMALLOC) extern "C" { @@ -889,15 +896,6 @@ int tc_set_new_mode(int mode); } #endif // defined(USE_TCMALLOC) -// Android doesn't implement set_new_handler, so we can't use the -// OutOfMemoryTest cases. -// OpenBSD does not support these tests either. -#if !defined(OS_ANDROID) && !defined(OS_OPENBSD) - -// 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. -#if !defined(ADDRESS_SANITIZER) class OutOfMemoryDeathTest : public testing::Test { public: OutOfMemoryDeathTest() @@ -1130,8 +1128,5 @@ TEST_F(OutOfMemoryDeathTest, PsychoticallyBigObjCObject) { #endif // !ARCH_CPU_64_BITS #endif // OS_MACOSX -#endif // !defined(ADDRESS_SANITIZER) - -#endif // !defined(OS_ANDROID) - -#endif // !defined(OS_WIN) +#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && + // !defined(OS_WIN) && !defined(ADDRESS_SANITIZER) |