commit 3150a5e95c99a4a437368fb66c007fd5a7828d43
author Caslyn Tonelli <caslyn@google.com> Fri Apr 28 10:04:22 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 28 10:04:22 2023 +0000
tree 291c7f06270e61aae8244e857ac9c145f6b5d2f9
parent ebe846acc4b03b64c443e554c8568a4406764c3d
parent 06d685e3fe11209adb4591a27e78db320b088355

[gwp_asan] Exclude recoverable tests on Fuchsia am: 92529f313e am: e019f02f85 am: 6e6144b17e am: 1843ed9c81 am: 06d685e3fe

Original change: https://android-review.googlesource.com/c/platform/external/gwp_asan/+/2569410

Change-Id: I258a249693f17c932cfa98426c47bb08a6113998
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

gwp_asan/tests/backtrace.cpp

diff --git a/gwp_asan/tests/backtrace.cpp b/gwp_asan/tests/backtrace.cpp
index 7cbbcf5..6a84a2a 100644
--- a/gwp_asan/tests/backtrace.cpp
+++ b/gwp_asan/tests/backtrace.cpp
@@ -21,7 +21,7 @@
   DeathRegex.append("was deallocated.*DeallocateMemory[^2].*");
   DeathRegex.append("was allocated.*AllocateMemory");
   if (!Recoverable) {
-    ASSERT_DEATH(DeallocateMemory2(GPA, Ptr), DeathRegex);
+    EXPECT_DEATH(DeallocateMemory2(GPA, Ptr), DeathRegex);
     return;
   }
 
@@ -51,7 +51,7 @@
   DeathRegex.append("was allocated.*AllocateMemory");
 
   if (!Recoverable) {
-    ASSERT_DEATH(TouchMemory(Ptr), DeathRegex);
+    EXPECT_DEATH(TouchMemory(Ptr), DeathRegex);
     return;
   }
 

gwp_asan/tests/harness.cpp

diff --git a/gwp_asan/tests/harness.cpp b/gwp_asan/tests/harness.cpp
index 6d41630..4633d3e 100644
--- a/gwp_asan/tests/harness.cpp
+++ b/gwp_asan/tests/harness.cpp
@@ -47,8 +47,15 @@
       << OutputBuffer;
 }
 
+// Fuchsia does not support recoverable GWP-ASan.
+#if defined(__Fuchsia__)
+INSTANTIATE_TEST_SUITE_P(RecoverableAndNonRecoverableTests,
+                         BacktraceGuardedPoolAllocatorDeathTest,
+                         /* Recoverable */ testing::Values(false));
+#else
 INSTANTIATE_TEST_SUITE_P(RecoverableTests, BacktraceGuardedPoolAllocator,
                          /* Recoverable */ testing::Values(true));
 INSTANTIATE_TEST_SUITE_P(RecoverableAndNonRecoverableTests,
                          BacktraceGuardedPoolAllocatorDeathTest,
                          /* Recoverable */ testing::Bool());
+#endif