Revert "Blacklist tests failing on valgrind."
We use the msync syscall to test if pages are mapped without actually
getting a segv. Valgrind (correctly) sees this as an illegal access.
We need to add the testing function to the valgrind suppression file.
Reason for revert: Added required valgrind suppressions
This reverts commit 45a6da0f6bd341d62fa753ac69bb4d31f219762f.
Bug: 72909916
Test: mma -j40 valgrind-test-art-host-gtest-mem_map_test64
Change-Id: Ib228570d0bb17c59df0e17a68de38ff25f63eeb9
diff --git a/runtime/mem_map_test.cc b/runtime/mem_map_test.cc
index 172472a..3adbf18 100644
--- a/runtime/mem_map_test.cc
+++ b/runtime/mem_map_test.cc
@@ -166,7 +166,6 @@
// 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_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_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 086a856..a97d03c 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
+ ...
+}