| commit | f45bc90dc489615e36a14c2725d54834640be49d | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Wed Jun 09 00:30:13 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 09 00:30:13 2021 +0000 |
| tree | d597a770e45d269ba3b82aec849922b52a14cdb5 | |
| parent | 81df871c3b1c8ce4082dce9900eece1cec051a0c [diff] | |
| parent | 33b86cc6c1f98b0f13adbc47e878227bb6924123 [diff] |
Merge "Skip the malloc_slack test on native bridge." am: 33b86cc6c1 Original change: https://android-review.googlesource.com/c/platform/bionic/+/1730406 Change-Id: Id4224d7e5036bc55b0b5bf49a010dfe47402856f
diff --git a/tests/malloc_test.cpp b/tests/malloc_test.cpp index d73f243..30da5c3 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) {