[compiler-rt] d991209 - Revert "[GWP-ASan] Fix test to work with Fuchsia's zxtest"

[Mitch Phillips via llvm-commits]

Author: Mitch Phillips
Date: 2023-01-12T15:59:58-08:00
New Revision: d99120939ecbe686d418fc29fdac9bc6574b5f30

URL: https://github.com/llvm/llvm-project/commit/d99120939ecbe686d418fc29fdac9bc6574b5f30
DIFF: https://github.com/llvm/llvm-project/commit/d99120939ecbe686d418fc29fdac9bc6574b5f30.diff

LOG: Revert "[GWP-ASan] Fix test to work with Fuchsia's zxtest"

This reverts commit 64138725e4cf0ab5e3f9c0dba38e11ce3d3b4017.

Parent change https://reviews.llvm.org/D140173 broke an internal build.
I'll land this bit as part of the re-land for
https://reviews.llvm.org/D140173.

Added: 
    

Modified: 
    compiler-rt/lib/gwp_asan/tests/harness.h

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/gwp_asan/tests/harness.h b/compiler-rt/lib/gwp_asan/tests/harness.h
index e6be68cf74b3c..2c8187ca873f8 100644
--- a/compiler-rt/lib/gwp_asan/tests/harness.h
+++ b/compiler-rt/lib/gwp_asan/tests/harness.h
@@ -14,11 +14,9 @@
 #if defined(__Fuchsia__)
 #include <zxtest/zxtest.h>
 using Test = ::zxtest::Test;
-template <typename T> using TestWithParam = ::zxtest::TestWithParam<T>;
 #else
 #include "gtest/gtest.h"
 using Test = ::testing::Test;
-template <typename T> using TestWithParam = ::zxtest::TestWithParam<T>;
 #endif
 
 #include "gwp_asan/guarded_pool_allocator.h"
@@ -84,7 +82,7 @@ class CustomGuardedPoolAllocator : public Test {
 };
 
 class BacktraceGuardedPoolAllocator
-    : public TestWithParam</* Recoverable */ bool> {
+    : public testing::TestWithParam</* Recoverable */ bool> {
 public:
   void SetUp() override {
     gwp_asan::options::Options Opts;