aboutsummaryrefslogtreecommitdiff
path: root/libc/malloc_debug
diff options
context:
space:
mode:
Diffstat (limited to 'libc/malloc_debug')
-rw-r--r--libc/malloc_debug/Android.bp1
-rw-r--r--libc/malloc_debug/tests/malloc_debug_system_tests.cpp2
2 files changed, 3 insertions, 0 deletions
diff --git a/libc/malloc_debug/Android.bp b/libc/malloc_debug/Android.bp
index c7c88e13c..5aea771d9 100644
--- a/libc/malloc_debug/Android.bp
+++ b/libc/malloc_debug/Android.bp
@@ -167,6 +167,7 @@ cc_test {
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 eaf86c5a6..584370206 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) {
}
TEST_F(MallocDebugSystemTest, verify_leak_allocation_limit) {
+ SKIP_WITH_HWASAN;
VerifyLeak("leak_memory_limit_");
}