diff options
| -rw-r--r-- | runtime/mem_map_test.cc | 3 | ||||
| -rw-r--r-- | test/valgrind-suppressions.txt | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/runtime/mem_map_test.cc b/runtime/mem_map_test.cc index 172472a957..3adbf18a7a 100644 --- a/runtime/mem_map_test.cc +++ b/runtime/mem_map_test.cc @@ -166,7 +166,6 @@ TEST_F(MemMapTest, Start) { // We need mremap to be able to test ReplaceMapping at all #if HAVE_MREMAP_SYSCALL TEST_F(MemMapTest, ReplaceMapping_SameSize) { - TEST_DISABLED_FOR_MEMORY_TOOL_VALGRIND(); std::string error_msg; std::unique_ptr<MemMap> dest(MemMap::MapAnonymous("MapAnonymousEmpty-atomic-replace-dest", nullptr, @@ -204,7 +203,6 @@ TEST_F(MemMapTest, ReplaceMapping_SameSize) { } TEST_F(MemMapTest, ReplaceMapping_MakeLarger) { - TEST_DISABLED_FOR_MEMORY_TOOL_VALGRIND(); std::string error_msg; std::unique_ptr<MemMap> dest(MemMap::MapAnonymous("MapAnonymousEmpty-atomic-replace-dest", nullptr, @@ -253,7 +251,6 @@ TEST_F(MemMapTest, ReplaceMapping_MakeLarger) { } TEST_F(MemMapTest, ReplaceMapping_MakeSmaller) { - TEST_DISABLED_FOR_MEMORY_TOOL_VALGRIND(); std::string error_msg; std::unique_ptr<MemMap> dest(MemMap::MapAnonymous("MapAnonymousEmpty-atomic-replace-dest", nullptr, diff --git a/test/valgrind-suppressions.txt b/test/valgrind-suppressions.txt index 086a856f51..a97d03c2d4 100644 --- a/test/valgrind-suppressions.txt +++ b/test/valgrind-suppressions.txt @@ -75,3 +75,13 @@ process_vm_readv(lvec[...]) fun:process_vm_readv } + +# Suppressions for IsAddressMapped check in MemMapTest +{ + MemMapTest_IsAddressMapped + Memcheck:Param + msync(start) + ... + fun:_ZN3art10MemMapTest15IsAddressMappedEPv + ... +} |