| commit | 5e5acad528368cda5691ee4d5e4dcbb950f8bb28 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Apr 27 19:00:59 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 27 19:00:59 2022 +0000 |
| tree | 1c55d107646fdf2e884c7acdba32a92f9ac3fc76 | |
| parent | 68fd586b3ada4458e819511831e3c50479db88e8 [diff] | |
| parent | 1623704319351fdc4bd90ab22893a2897aef4ac0 [diff] |
Merge "Skip the malloc_slack test on native bridge." into android12-tests-dev am: 1623704319 Original change: https://android-review.googlesource.com/c/platform/bionic/+/1854022 Change-Id: Id50dd0d3a8060ad7943a9f08401e88b05c75be4b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/malloc_test.cpp b/tests/malloc_test.cpp index f4a1c0d..e5e78a5 100644 --- a/tests/malloc_test.cpp +++ b/tests/malloc_test.cpp
@@ -1355,6 +1355,8 @@ TEST(malloc, allocation_slack) { #if defined(__BIONIC__) + SKIP_WITH_NATIVE_BRIDGE; // http://b/189606147 + bool allocator_scudo; GetAllocatorVersion(&allocator_scudo); if (!allocator_scudo) {