diff options
| author | 2013-11-13 12:40:11 -0800 | |
|---|---|---|
| committer | 2013-11-13 13:48:28 -0800 | |
| commit | d912e5c36f952db8ff027d67979724fe0e56b35a (patch) | |
| tree | d977d70782b7d6302aaf095cacc9ce3b9ca2eeb0 | |
| parent | 34e82934546bd470283346907bd7b74990797c56 (diff) | |
Allow host valgrind gtests to be run individually.
Change-Id: I80976600034046cb42e8565bfd38f75811d7a08e
| -rw-r--r-- | Android.mk | 7 | ||||
| -rw-r--r-- | build/Android.gtest.mk | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk index 8024a3d357..bf2eb9a33a 100644 --- a/Android.mk +++ b/Android.mk @@ -146,14 +146,9 @@ test-art-host-dependencies: $(ART_HOST_TEST_DEPENDENCIES) $(HOST_OUT_SHARED_LIBR test-art-host-gtest: $(ART_HOST_TEST_TARGETS) @echo test-art-host-gtest PASSED -define run-host-gtests-with - $(foreach file,$(sort $(ART_HOST_TEST_EXECUTABLES)),$(1) $(file) &&) true -endef - # "mm valgrind-test-art-host-gtest" to build and run the host gtests under valgrind. .PHONY: valgrind-test-art-host-gtest -valgrind-test-art-host-gtest: test-art-host-dependencies - $(call run-host-gtests-with,valgrind --leak-check=full) +valgrind-test-art-host-gtest: $(ART_HOST_VALGRIND_TEST_TARGETS) @echo valgrind-test-art-host-gtest PASSED .PHONY: test-art-host-oat-default diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 655c7dd01f..8165ec7ffc 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -170,6 +170,13 @@ $$(art_gtest_target): $$(art_gtest_exe) test-art-host-dependencies @echo $$@ PASSED ART_HOST_TEST_TARGETS += $$(art_gtest_target) + +.PHONY: valgrind-$$(art_gtest_target) +valgrind-$$(art_gtest_target): $$(art_gtest_exe) test-art-host-dependencies + valgrind --leak-check=full $$< + @echo $$@ PASSED + +ART_HOST_VALGRIND_TEST_TARGETS += valgrind-$$(art_gtest_target) endif endef |