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/fortify_test.cpp | |
| parent | 987dccb5f063052171fae7a59cbf9fca808f8f80 (diff) | |
| parent | 4626df89bfb561fc06d805e04d040a15f378919f (diff) | |
Merge SP1A.210425.001
Change-Id: If71c56f3e2e9fbbeffc7096a560a5ef8b8cd8566
Diffstat (limited to 'tests/fortify_test.cpp')
| -rw-r--r-- | tests/fortify_test.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/fortify_test.cpp b/tests/fortify_test.cpp index 3ca0223b2..4abee67dc 100644 --- a/tests/fortify_test.cpp +++ b/tests/fortify_test.cpp @@ -15,7 +15,6 @@ */ #include <gtest/gtest.h> -#include "BionicDeathTest.h" #include <fcntl.h> #include <malloc.h> @@ -28,6 +27,8 @@ #include <sys/types.h> #include <time.h> +#include <android-base/silent_death_test.h> + #if __BIONIC__ #define ASSERT_FORTIFY(expr) ASSERT_EXIT(expr, testing::KilledBySignal(SIGABRT), "FORTIFY") #else @@ -40,7 +41,7 @@ #define DEATHTEST_EVALUATOR(name) DEATHTEST_PASTER(name) #define DEATHTEST DEATHTEST_EVALUATOR(TEST_NAME) -class DEATHTEST : public BionicDeathTest {}; +using DEATHTEST = SilentDeathTest; #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE == 2 struct foo { |