diff options
| author | Florian Mayer <fmayer@google.com> | 2022-04-14 19:25:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-14 19:25:16 +0000 |
| commit | 0a66512877d6652b3fdb86e39ddff8e3394c0803 (patch) | |
| tree | a5dc48424adfba5f0cf8d16005f3f621a3f50474 | |
| parent | 9461f9e9d603875e3f75898695784c5541e61222 (diff) | |
| parent | 99662ce913902a88acf07b6f39e73a7236f687d1 (diff) | |
| download | bionic-0a66512877d6652b3fdb86e39ddff8e3394c0803.tar.gz | |
Merge "Skip verify_leak_allocation_limit under HWASan." am: 4fa856486b am: 99662ce913
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2064468
Change-Id: Ifcc9513c20bdb3b374fb3283c72f8afbac400a08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libc/malloc_debug/Android.bp | 1 | ||||
| -rw-r--r-- | libc/malloc_debug/tests/malloc_debug_system_tests.cpp | 2 |
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_"); } |