From 93c0f344d8c568535bd56d591b3d42050c71676a Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 8 Jan 2018 15:59:28 -0800 Subject: 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 Reviewed-by: Tom Sepez --- core/fxcrt/unowned_ptr_unittest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/fxcrt/unowned_ptr_unittest.cpp b/core/fxcrt/unowned_ptr_unittest.cpp index 3fc5308e46..26dffd46ec 100644 --- a/core/fxcrt/unowned_ptr_unittest.cpp +++ b/core/fxcrt/unowned_ptr_unittest.cpp @@ -54,7 +54,7 @@ TEST(UnownedPtr, PtrOk) { } TEST(UnownedPtr, PtrNotOk) { -#if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) +#if defined(ADDRESS_SANITIZER) EXPECT_DEATH(DeleteDangling(), ""); #else DeleteDangling(); @@ -71,7 +71,7 @@ TEST(UnownedPtr, AssignOk) { } TEST(UnownedPtr, AssignNotOk) { -#if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) +#if defined(ADDRESS_SANITIZER) EXPECT_DEATH(AssignDangling(), ""); #else AssignDangling(); @@ -88,7 +88,7 @@ TEST(UnownedPtr, ReleaseOk) { } TEST(UnownedPtr, ReleaseNotOk) { -#if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) +#if defined(ADDRESS_SANITIZER) EXPECT_DEATH(ReleaseDangling(), ""); #else ReleaseDangling(); -- cgit v1.2.3