diff options
| author | Scott Lobdell <slobdell@google.com> | 2021-04-25 19:53:00 +0000 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2021-04-25 19:53:00 +0000 |
| commit | dfa7c0a9b59c4ef591f46f7624dfe687c2bb0a6c (patch) | |
| tree | 4b78af6f79fb9de2a712ac6268059bf838000a40 /tests/stack_protector_test.cpp | |
| parent | 987dccb5f063052171fae7a59cbf9fca808f8f80 (diff) | |
| parent | 4626df89bfb561fc06d805e04d040a15f378919f (diff) | |
Merge SP1A.210425.001
Change-Id: If71c56f3e2e9fbbeffc7096a560a5ef8b8cd8566
Diffstat (limited to 'tests/stack_protector_test.cpp')
| -rw-r--r-- | tests/stack_protector_test.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/stack_protector_test.cpp b/tests/stack_protector_test.cpp index 9fe7bb105..a95e0373c 100644 --- a/tests/stack_protector_test.cpp +++ b/tests/stack_protector_test.cpp @@ -19,7 +19,6 @@ */ #include <gtest/gtest.h> -#include "BionicDeathTest.h" #include <pthread.h> #include <stdint.h> @@ -27,6 +26,8 @@ #include <unistd.h> #include <set> +#include <android-base/silent_death_test.h> + #include "private/bionic_tls.h" extern "C" pid_t gettid(); // glibc defines this but doesn't declare it anywhere. @@ -99,7 +100,7 @@ TEST(stack_protector, global_guard) { #endif } -class stack_protector_DeathTest : public BionicDeathTest {}; +using stack_protector_DeathTest = SilentDeathTest; TEST_F(stack_protector_DeathTest, modify_stack_protector) { // In another file to prevent inlining, which removes stack protection. |