| commit | 1623704319351fdc4bd90ab22893a2897aef4ac0 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Oct 19 21:30:05 2021 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Oct 19 21:30:05 2021 +0000 |
| tree | 3e60af5cb0adc88ead9c6f9db3d5fd928ba9c175 | |
| parent | 05f451ff409711cf78fc553d792383e59cb69194 [diff] | |
| parent | 069cf41429fe8eab0f7412182f02ae6e0852ef7b [diff] |
Merge "Skip the malloc_slack test on native bridge." into android12-tests-dev
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) {