diff options
author | Alex Brachet <abrachet@google.com> | 2023-03-02 01:39:11 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-02 01:39:11 +0000 |
commit | 14fd60cbf538c4c7b3377f36887756edf2ee90c1 (patch) | |
tree | dc3bd2505cc50228047e5d5b32e79f83e3433223 | |
parent | a2537a5dc55b0a39c60355c7bd6bc270aa03767b (diff) | |
parent | 1600e33335f07677dbf31c410c106753bacfc99e (diff) | |
download | gwp_asan-14fd60cbf538c4c7b3377f36887756edf2ee90c1.tar.gz |
[GWP-ASan] Stop using type aliases for ::testing:: types am: 8d810da786 am: 96602a3a08 am: 1600e33335
Original change: https://android-review.googlesource.com/c/platform/external/gwp_asan/+/2464591
Change-Id: I1a365c738fa733b8d6c8f425f8efb632a62603e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | gwp_asan/tests/crash_handler_api.cpp | 2 | ||||
-rw-r--r-- | gwp_asan/tests/harness.h | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/gwp_asan/tests/crash_handler_api.cpp b/gwp_asan/tests/crash_handler_api.cpp index 598b7b8..d270ed8 100644 --- a/gwp_asan/tests/crash_handler_api.cpp +++ b/gwp_asan/tests/crash_handler_api.cpp @@ -16,7 +16,7 @@ using GuardedPoolAllocator = gwp_asan::GuardedPoolAllocator; using AllocationMetadata = gwp_asan::AllocationMetadata; using AllocatorState = gwp_asan::AllocatorState; -class CrashHandlerAPITest : public Test { +class CrashHandlerAPITest : public ::testing::Test { public: void SetUp() override { setupState(); } diff --git a/gwp_asan/tests/harness.h b/gwp_asan/tests/harness.h index 89f4e11..7129539 100644 --- a/gwp_asan/tests/harness.h +++ b/gwp_asan/tests/harness.h @@ -13,12 +13,9 @@ #if defined(__Fuchsia__) #include <zxtest/zxtest.h> -using Test = ::zxtest::Test; -template <typename T> using TestWithParam = ::zxtest::TestWithParam<T>; +namespace testing = zxtest; #else #include "gtest/gtest.h" -using Test = ::testing::Test; -template <typename T> using TestWithParam = ::testing::TestWithParam<T>; #endif #include "gwp_asan/guarded_pool_allocator.h" @@ -48,7 +45,7 @@ void TouchMemory(void *Ptr); void CheckOnlyOneGwpAsanCrash(const std::string &OutputBuffer); -class DefaultGuardedPoolAllocator : public Test { +class DefaultGuardedPoolAllocator : public ::testing::Test { public: void SetUp() override { gwp_asan::options::Options Opts; @@ -67,7 +64,7 @@ protected: MaxSimultaneousAllocations; }; -class CustomGuardedPoolAllocator : public Test { +class CustomGuardedPoolAllocator : public ::testing::Test { public: void InitNumSlots(decltype(gwp_asan::options::Options::MaxSimultaneousAllocations) @@ -91,7 +88,7 @@ protected: }; class BacktraceGuardedPoolAllocator - : public TestWithParam</* Recoverable */ bool> { + : public ::testing::TestWithParam</* Recoverable */ bool> { public: void SetUp() override { gwp_asan::options::Options Opts; |