commit afbb6d6e07312fb12765eb6bc90a56ff61fe657f
author Florian Mayer <fmayer@google.com> Thu Apr 07 04:45:55 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 07 04:45:55 2022 +0000
tree 4902dcbc619fa5d30b44314b029cfc2689d7aa11
parent 227ce2d58d84f2b8f43212dd72e3d772e4e17b55
parent 039d856e9b79520ba3d631931a67d2949a398186

Merge "Skip mallinfo / malloc_info tests on HWASan." am: ad3710992d am: 039d856e9b

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2056608

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

libc/malloc_debug/Android.bp

diff --git a/libc/malloc_debug/Android.bp b/libc/malloc_debug/Android.bp
index f779b73..c7c88e1 100644
--- a/libc/malloc_debug/Android.bp
+++ b/libc/malloc_debug/Android.bp
@@ -133,6 +133,7 @@
     include_dirs: [
         "bionic/libc",
         "bionic/libc/async_safe/include",
+        "bionic", // For SKIP_WITH_HWASAN.
     ],
 
     header_libs: [

libc/malloc_debug/tests/malloc_debug_unit_tests.cpp

diff --git a/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp b/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp
index 46de3e9..84f0645 100644
--- a/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp
+++ b/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp
@@ -43,6 +43,7 @@
 
 #include <platform/bionic/macros.h>
 #include <private/bionic_malloc_dispatch.h>
+#include <tests/utils.h>
 
 #include <unwindstack/Unwinder.h>
 
@@ -2063,6 +2064,7 @@
 }
 
 TEST_F(MallocDebugTest, debug_mallinfo) {
+  SKIP_WITH_HWASAN;
   Init("guard");
 
   void* pointer = debug_malloc(150);
@@ -2475,6 +2477,7 @@
 }
 
 TEST_F(MallocDebugTest, malloc_info_no_pointer_tracking) {
+  SKIP_WITH_HWASAN;
   Init("fill");
 
   TemporaryFile tf;