| commit | 33b86cc6c1f98b0f13adbc47e878227bb6924123 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Wed Jun 09 00:11:07 2021 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Jun 09 00:11:07 2021 +0000 |
| tree | d597a770e45d269ba3b82aec849922b52a14cdb5 | |
| parent | 8ab7ab147c390ee3f46e8d20491c95e4ad4e6e66 [diff] | |
| parent | 7c0ce86a00433159dfc5dc7164feb752d094dff4 [diff] |
Merge "Skip the malloc_slack test on native bridge."
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) {