diff options
| -rw-r--r-- | build/Android.gtest.mk | 4 | ||||
| -rw-r--r-- | test/valgrind-suppressions.txt | 9 | ||||
| -rw-r--r-- | test/valgrind-target-suppressions.txt | 9 |
3 files changed, 21 insertions, 1 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 08b56d0822..c09241a38a 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -535,6 +535,7 @@ valgrind-$$(gtest_rule): $(ART_VALGRIND_TARGET_DEPENDENCIES) test-art-target-syn (adb shell "$(GCOV_ENV) LD_LIBRARY_PATH=$(3) ANDROID_ROOT=$(ART_GTEST_TARGET_ANDROID_ROOT) \ valgrind --leak-check=full --error-exitcode=1 --workaround-gcc296-bugs=yes \ --suppressions=$(ART_TARGET_TEST_DIR)/valgrind-target-suppressions.txt \ + --num-callers=50 \ $(ART_TARGET_NATIVETEST_DIR)/$(TARGET_$(2)ARCH)/$(1) && touch $(ART_TARGET_TEST_DIR)/$(TARGET_$(2)ARCH)/$$@-$$$$PPID" \ && (adb pull $(ART_TARGET_TEST_DIR)/$(TARGET_$(2)ARCH)/$$@-$$$$PPID /tmp/ \ && $$(call ART_TEST_PASSED,$$@)) \ @@ -591,7 +592,8 @@ valgrind-$$(gtest_rule): $$(gtest_exe) $$(gtest_deps) $(ART_VALGRIND_DEPENDENCIE $(hide) $$(call ART_TEST_SKIP,$$@) && \ VALGRIND_LIB=$(HOST_OUT)/lib64/valgrind \ $(HOST_OUT_EXECUTABLES)/valgrind --leak-check=full --error-exitcode=1 \ - --suppressions=art/test/valgrind-suppressions.txt $$< && \ + --suppressions=art/test/valgrind-suppressions.txt --num-callers=50 \ + $$< && \ $$(call ART_TEST_PASSED,$$@) || $$(call ART_TEST_FAILED,$$@) ART_TEST_HOST_VALGRIND_GTEST$$($(2)ART_PHONY_TEST_HOST_SUFFIX)_RULES += valgrind-$$(gtest_rule) diff --git a/test/valgrind-suppressions.txt b/test/valgrind-suppressions.txt index acab6e5135..fd3c3318ce 100644 --- a/test/valgrind-suppressions.txt +++ b/test/valgrind-suppressions.txt @@ -13,3 +13,12 @@ fun:_dl_start obj:/lib/x86_64-linux-gnu/ld-2.19.so } + +{ + b/31275764 + Memcheck:Leak + match-leak-kinds: definite + fun:malloc + ... + fun:_ZN3art7Runtime17InitNativeMethodsEv +} diff --git a/test/valgrind-target-suppressions.txt b/test/valgrind-target-suppressions.txt index 7ae6d539f3..fbc99b12ce 100644 --- a/test/valgrind-target-suppressions.txt +++ b/test/valgrind-target-suppressions.txt @@ -50,3 +50,12 @@ fun:malloc fun:setenv } + +{ + b/31275764 + Memcheck:Leak + match-leak-kinds: definite + fun:malloc + ... + fun:_ZN3art7Runtime17InitNativeMethodsEv +} |