Merge "Skip verify_leak_allocation_limit under HWASan." am: 4fa856486b am: 99662ce913 am: 0a66512877
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2064468
Change-Id: I5fcc7d4c7634c48c750252ae3e96250b2cd0114c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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: [
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_");
}