tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Change-Id: Ib18de139ed39b25b22628ba32e0e95cbc520aab0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Florian Mayer 2022-04-07 05:16:10 +00:00 committed by Automerger Merge Worker
commit 6e2ba91b60
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libc/malloc_debug/Android.bp
View file

@ -133,6 +133,7 @@ cc_test {
include_dirs: [
"bionic/libc",
"bionic/libc/async_safe/include",
"bionic", // For SKIP_WITH_HWASAN.
],
header_libs: [

3
libc/malloc_debug/tests/malloc_debug_unit_tests.cpp
View file

@ -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, max_size) {
}
TEST_F(MallocDebugTest, debug_mallinfo) {
SKIP_WITH_HWASAN;
Init("guard");
void* pointer = debug_malloc(150);
@ -2475,6 +2477,7 @@ TEST_F(MallocDebugTest, abort_on_error_header_tag_corrupted) {
}
TEST_F(MallocDebugTest, malloc_info_no_pointer_tracking) {
SKIP_WITH_HWASAN;
Init("fill");
TemporaryFile tf;