diff options
| author | Elliott Hughes <enh@google.com> | 2021-01-15 00:49:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-01-15 00:49:45 +0000 |
| commit | e925485acdfdbef0894bf26e1d0595002b83c696 (patch) | |
| tree | 4849947e9733fa1fbb97686ea77ed18eda47b3ee /tests/malloc_test.cpp | |
| parent | caf32c7697a444a49457619b86d87e265d14971b (diff) | |
| parent | 446b4dde724ee64a336a78188c3c9a15aebca87c (diff) | |
Merge "Make "disable memory mitigations" and "set heap tagging level" more available."
Diffstat (limited to 'tests/malloc_test.cpp')
| -rw-r--r-- | tests/malloc_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/malloc_test.cpp b/tests/malloc_test.cpp index bddd9ab63..b35bba983 100644 --- a/tests/malloc_test.cpp +++ b/tests/malloc_test.cpp @@ -1256,7 +1256,7 @@ TEST(android_mallopt, set_allocation_limit_multiple_threads) { #endif } -TEST(android_mallopt, disable_memory_mitigations) { +TEST(malloc, disable_memory_mitigations) { #if defined(__BIONIC__) if (!mte_supported()) { GTEST_SKIP() << "This function can only be tested with MTE"; @@ -1275,7 +1275,7 @@ TEST(android_mallopt, disable_memory_mitigations) { }, &sem)); - ASSERT_TRUE(android_mallopt(M_DISABLE_MEMORY_MITIGATIONS, nullptr, 0)); + ASSERT_EQ(1, mallopt(M_BIONIC_DISABLE_MEMORY_MITIGATIONS, 0)); ASSERT_EQ(0, sem_post(&sem)); int my_tagged_addr_ctrl = prctl(PR_GET_TAGGED_ADDR_CTRL, 0, 0, 0, 0); |