commit dca7229b06450e82d4e7e87aa946931acef366e5
author Florian Mayer <fmayer@google.com> Wed Apr 13 14:39:36 2022 -0700
committer Florian Mayer <fmayer@google.com> Thu Apr 14 16:21:12 2022 +0000
tree a5dc48424adfba5f0cf8d16005f3f621a3f50474
parent 8cfc318a874cc0d263a55c32b4b32a2a35be7177

Skip verify_leak_allocation_limit under HWASan.

Bug: 227801493
Change-Id: I85630fe11b42d8d45ce63f279bb0fbcc635f8afb

libc/malloc_debug/Android.bp

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

libc/malloc_debug/tests/malloc_debug_system_tests.cpp

diff --git a/libc/malloc_debug/tests/malloc_debug_system_tests.cpp b/libc/malloc_debug/tests/malloc_debug_system_tests.cpp
index eaf86c5..5843702 100644
--- a/libc/malloc_debug/tests/malloc_debug_system_tests.cpp
+++ b/libc/malloc_debug/tests/malloc_debug_system_tests.cpp
@@ -55,6 +55,7 @@
 #include <backtrace/BacktraceMap.h>
 
 #include <bionic/malloc.h>
+#include <tests/utils.h>
 
 // All DISABLED_ tests are designed to be executed after malloc debug
 // is enabled. These tests don't run be default, and are executed
@@ -610,6 +611,7 @@
 }
 
 TEST_F(MallocDebugSystemTest, verify_leak_allocation_limit) {
+  SKIP_WITH_HWASAN;
   VerifyLeak("leak_memory_limit_");
 }