commit 93c0f344d8c568535bd56d591b3d42050c71676a
author Lei Zhang <thestig@chromium.org> Mon Jan 08 15:59:28 2018 -0800
committer Chromium commit bot <commit-bot@chromium.org> Tue Jan 09 00:26:44 2018 +0000
tree dc0c6c5077b2a8919607e3f08936e89539584576
parent 63579f90483ec759fe849c451b76dbae306c3da6

Fix death tests for UnownedPtr + MSAN.

They should only expect death in ASAN builds.

BUG=pdfium:958

Change-Id: I62bd51151238bc57abb5fe700985c33d7fde3e28
Reviewed-on: https://pdfium-review.googlesource.com/21930
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

core/fxcrt/unowned_ptr_unittest.cpp

diff --git a/core/fxcrt/unowned_ptr_unittest.cpp b/core/fxcrt/unowned_ptr_unittest.cpp
index 3fc5308..26dffd4 100644
--- a/core/fxcrt/unowned_ptr_unittest.cpp
+++ b/core/fxcrt/unowned_ptr_unittest.cpp
@@ -54,7 +54,7 @@
 }
 
 TEST(UnownedPtr, PtrNotOk) {
-#if defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
+#if defined(ADDRESS_SANITIZER)
   EXPECT_DEATH(DeleteDangling(), "");
 #else
   DeleteDangling();
@@ -71,7 +71,7 @@
 }
 
 TEST(UnownedPtr, AssignNotOk) {
-#if defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
+#if defined(ADDRESS_SANITIZER)
   EXPECT_DEATH(AssignDangling(), "");
 #else
   AssignDangling();
@@ -88,7 +88,7 @@
 }
 
 TEST(UnownedPtr, ReleaseNotOk) {
-#if defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
+#if defined(ADDRESS_SANITIZER)
   EXPECT_DEATH(ReleaseDangling(), "");
 #else
   ReleaseDangling();