aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2021-06-08 15:33:22 -0700
committerLev Rumyantsev <levarum@google.com>2021-10-12 04:24:38 +0000
commit069cf41429fe8eab0f7412182f02ae6e0852ef7b (patch)
tree3e60af5cb0adc88ead9c6f9db3d5fd928ba9c175
parent05f451ff409711cf78fc553d792383e59cb69194 (diff)
downloadbionic-069cf41429fe8eab0f7412182f02ae6e0852ef7b.tar.gz
Skip the malloc_slack test on native bridge.
The allocator for the native bridge is not necessarily going to allocate the slack data. Bug: 202428612 Test: Ran on non-native bridge and verified test isn't skipped. Test: Ran on native bridge and verified test is skipped. Change-Id: Ia1555be0e9f55896af7ca81830605367133c44a1 (cherry picked from commit 7c0ce86a00433159dfc5dc7164feb752d094dff4)
-rw-r--r--tests/malloc_test.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/malloc_test.cpp b/tests/malloc_test.cpp
index d73f2436d..30da5c32f 100644
--- a/tests/malloc_test.cpp
+++ b/tests/malloc_test.cpp
@@ -1355,6 +1355,8 @@ TEST(malloc, disable_mte) {
TEST(malloc, allocation_slack) {
#if defined(__BIONIC__)
+ SKIP_WITH_NATIVE_BRIDGE; // http://b/189606147
+
bool allocator_scudo;
GetAllocatorVersion(&allocator_scudo);
if (!allocator_scudo) {