Merge "Disable libmemunreachable tests on HWASan builds." am: fe84c77a46 am: 3130a1a0b7

Original change: https://android-review.googlesource.com/c/platform/system/memory/libmemunreachable/+/2065512

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

3 files changed, 17 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index 77f126a..2a3fa1f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -61,7 +61,9 @@ cc_test {
         "tests/MemUnreachable_test.cpp",
     ],
     shared_libs: ["libmemunreachable"],
-
+    header_libs: [
+        "libbase_headers",
+    ],
     test_suites: ["device-tests"],
 }
 
@@ -99,7 +101,9 @@ cc_test {
             enabled: false,
         },
     },
-
+    header_libs: [
+        "libbase_headers",
+    ],
     test_suites: ["device-tests"],
 }
 
diff --git a/tests/DisableMalloc_test.cpp b/tests/DisableMalloc_test.cpp
index f446719..ae560ed 100644
--- a/tests/DisableMalloc_test.cpp
+++ b/tests/DisableMalloc_test.cpp
@@ -19,6 +19,8 @@
 #include <chrono>
 #include <functional>
 
+#include <android-base/test_utils.h>
+
 #include <ScopedDisableMalloc.h>
 #include <gtest/gtest.h>
 
@@ -35,6 +37,11 @@ class DisableMallocTest : public ::testing::Test {
     t.it_value.tv_usec = (us - s).count();
     setitimer(ITIMER_REAL, &t, NULL);
   }
+
+  void SetUp() override {
+    // HWASan does not support malloc_disable.
+    SKIP_WITH_HWASAN;
+  }
 };
 
 TEST_F(DisableMallocTest, reenable) {
diff --git a/tests/MemUnreachable_test.cpp b/tests/MemUnreachable_test.cpp
index d7dfc88..8bc176b 100644
--- a/tests/MemUnreachable_test.cpp
+++ b/tests/MemUnreachable_test.cpp
@@ -19,6 +19,8 @@
 #include <sys/prctl.h>
 #include <unistd.h>
 
+#include <android-base/test_utils.h>
+
 #include <gtest/gtest.h>
 
 #include <memunreachable/memunreachable.h>
@@ -54,6 +56,8 @@ static void Ref(void** ptr) {
 class MemunreachableTest : public ::testing::Test {
  protected:
   virtual void SetUp() {
+    // HWASan does not support malloc_disable, which is required by memunreachable.
+    SKIP_WITH_HWASAN;
     CleanStack(8192);
     CleanTcache();
   }