diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-20 21:39:09 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-20 21:39:09 +0000 |
commit | a532a87853a7515755a5bb553fc30ffda0a80875 (patch) | |
tree | 2b94fc60a93247d1e8b0239e1811e739ca0402b1 | |
parent | 6e930f587fabc18bab0ee2fdf66e5496b2b04eb6 (diff) | |
parent | 343a3e1fbc19a44d6f6fdfc6cae38ccc7f32e790 (diff) | |
download | gwp_asan-a532a87853a7515755a5bb553fc30ffda0a80875.tar.gz |
Snap for 9982369 from 343a3e1fbc19a44d6f6fdfc6cae38ccc7f32e790 to simpleperf-release
Change-Id: I983f1288856f4e660faf0cebc651e67d0c2bcdbe
-rw-r--r-- | gwp_asan/tests/harness.h | 7 | ||||
-rw-r--r-- | gwp_asan/tests/never_allocated.cpp | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gwp_asan/tests/harness.h b/gwp_asan/tests/harness.h index 3e85935..ae39a44 100644 --- a/gwp_asan/tests/harness.h +++ b/gwp_asan/tests/harness.h @@ -15,6 +15,13 @@ #define ZXTEST_USE_STREAMABLE_MACROS #include <zxtest/zxtest.h> namespace testing = zxtest; +// zxtest defines a different ASSERT_DEATH, taking a lambda and an error message +// if death didn't occur, versus gtest taking a statement and a string to search +// for in the dying process. zxtest doesn't define an EXPECT_DEATH, so we use +// that in the tests below (which works as intended for gtest), and we define +// EXPECT_DEATH as a wrapper for zxtest's ASSERT_DEATH. Note that zxtest drops +// the functionality for checking for a particular message in death. +#define EXPECT_DEATH(X, Y) ASSERT_DEATH(([&] { X; }), "") #else #include "gtest/gtest.h" #endif diff --git a/gwp_asan/tests/never_allocated.cpp b/gwp_asan/tests/never_allocated.cpp index bd43b22..2f695b4 100644 --- a/gwp_asan/tests/never_allocated.cpp +++ b/gwp_asan/tests/never_allocated.cpp @@ -25,7 +25,7 @@ TEST_P(BacktraceGuardedPoolAllocatorDeathTest, NeverAllocated) { // in the posix crash handler. char *volatile NeverAllocatedPtr = static_cast<char *>(Ptr) + 0x3000; if (!Recoverable) { - ASSERT_DEATH(*NeverAllocatedPtr = 0, DeathNeedle); + EXPECT_DEATH(*NeverAllocatedPtr = 0, DeathNeedle); return; } |