diff options
| author | Andreas Gampe <agampe@google.com> | 2015-02-20 16:52:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-20 16:52:16 +0000 |
| commit | 9ba69ece769ae8deab2e40d3a5ee0dce208a82c2 (patch) | |
| tree | ce7dd66ad1218bb0c603ffaf1b9c69e76a7f76c8 | |
| parent | 5ea203d88f5415aaeab345f967f206eea448d74e (diff) | |
| parent | 3c0bb3122c02120baac9203c8e62d71deac9a0e8 (diff) | |
| download | art-9ba69ece769ae8deab2e40d3a5ee0dce208a82c2.zip art-9ba69ece769ae8deab2e40d3a5ee0dce208a82c2.tar.gz art-9ba69ece769ae8deab2e40d3a5ee0dce208a82c2.tar.bz2 | |
Merge "ART: Use Valgrind from tree"
| -rw-r--r-- | build/Android.gtest.mk | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 5966951..30d9886 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -294,6 +294,16 @@ $$(gtest_rule): test-art-target-sync gtest_rule := endef # define-art-gtest-rule-target +ART_VALGRIND_DEPENDENCIES := \ + $(HOST_OUT_EXECUTABLES)/valgrind \ + $(HOST_OUT)/lib64/valgrind/memcheck-amd64-linux \ + $(HOST_OUT)/lib64/valgrind/memcheck-x86-linux \ + $(HOST_OUT)/lib64/valgrind/default.supp \ + $(HOST_OUT)/lib64/valgrind/vgpreload_core-amd64-linux.so \ + $(HOST_OUT)/lib64/valgrind/vgpreload_core-x86-linux.so \ + $(HOST_OUT)/lib64/valgrind/vgpreload_memcheck-amd64-linux.so \ + $(HOST_OUT)/lib64/valgrind/vgpreload_memcheck-x86-linux.so + # Define make rules for a host gtests. # $(1): gtest name - the name of the test we're building such as leb128_test. # $(2): 2ND_ or undefined - used to differentiate between the primary and secondary architecture. @@ -314,11 +324,12 @@ $$(gtest_rule): $$(gtest_exe) $$(ART_GTEST_$(1)_HOST_DEPS) $(foreach file,$(ART_ ART_TEST_HOST_GTEST_RULES += $$(gtest_rule) ART_TEST_HOST_GTEST_$(1)_RULES += $$(gtest_rule) + .PHONY: valgrind-$$(gtest_rule) -valgrind-$$(gtest_rule): $$(gtest_exe) $$(ART_GTEST_$(1)_HOST_DEPS) $(foreach file,$(ART_GTEST_$(1)_DEX_DEPS),$(ART_TEST_HOST_GTEST_$(file)_DEX)) $$(gtest_deps) +valgrind-$$(gtest_rule): $$(gtest_exe) $$(ART_GTEST_$(1)_HOST_DEPS) $(foreach file,$(ART_GTEST_$(1)_DEX_DEPS),$(ART_TEST_HOST_GTEST_$(file)_DEX)) $$(gtest_deps) $(ART_VALGRIND_DEPENDENCIES) $(hide) $$(call ART_TEST_SKIP,$$@) && \ - valgrind --leak-check=full --error-exitcode=1 $$< && $$(call ART_TEST_PASSED,$$@) \ - || $$(call ART_TEST_FAILED,$$@) + $(HOST_OUT_EXECUTABLES)/valgrind --leak-check=full --error-exitcode=1 $$< && \ + $$(call ART_TEST_PASSED,$$@) || $$(call ART_TEST_FAILED,$$@) ART_TEST_HOST_VALGRIND_GTEST$$($(2)ART_PHONY_TEST_HOST_SUFFIX)_RULES += valgrind-$$(gtest_rule) ART_TEST_HOST_VALGRIND_GTEST_RULES += valgrind-$$(gtest_rule) @@ -551,6 +562,7 @@ ART_GTEST_proxy_test_DEX_DEPS := ART_GTEST_reflection_test_DEX_DEPS := ART_GTEST_stub_test_DEX_DEPS := ART_GTEST_transaction_test_DEX_DEPS := +ART_VALGRIND_DEPENDENCIES := $(foreach dir,$(GTEST_DEX_DIRECTORIES), $(eval ART_TEST_TARGET_GTEST_$(dir)_DEX :=)) $(foreach dir,$(GTEST_DEX_DIRECTORIES), $(eval ART_TEST_HOST_GTEST_$(dir)_DEX :=)) GTEST_DEX_DIRECTORIES := |