diff options
| author | 2014-05-18 22:09:12 +0000 | |
|---|---|---|
| committer | 2014-05-18 22:09:12 +0000 | |
| commit | bf17a08fb48fa296acb09904d4c10ba42f63f55d (patch) | |
| tree | b1189e85b7e8b912b9a6cd6ef8440f31b928f2f1 | |
| parent | e9bcf0fa76cd9a96d36fe9e190bd2947e842fbf8 (diff) | |
| parent | 7a4c1c1533f6f25303752525424b6244e4c9b739 (diff) | |
Merge "Make vixl tests a dependency in the vixl makefile."
| -rw-r--r-- | Android.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Android.mk b/Android.mk index 57185ca6ec..0cd91663e1 100644 --- a/Android.mk +++ b/Android.mk @@ -151,18 +151,17 @@ test-art-run-test: test-art-host-run-test test-art-target-run-test # host test targets .PHONY: test-art-host-vixl +VIXL_TEST_DEPENDENCY := +# We can only run the vixl tests on 64-bit hosts (vixl testing issue) when its a +# top-level build (to declare the vixl test rule). ifneq ($(HOST_IS_64_BIT),) -test-art-host-vixl: $(ANDROID_HOST_OUT)/bin/cctest_vixl - $(ANDROID_HOST_OUT)/bin/cctest_vixl --run_all - @echo vixl PASSED - -else -# vixl test needs 64b host. -test-art-host-vixl: - @echo vixl test only runnable with 64b host build. - +ifeq ($(ONE_SHOT_MAKEFILE),) +VIXL_TEST_DEPENDENCY := run-vixl-tests +endif endif +test-art-host-vixl: $(VIXL_TEST_DEPENDENCY) + # "mm test-art-host" to build and run all host tests .PHONY: test-art-host test-art-host: test-art-host-gtest test-art-host-oat test-art-host-run-test test-art-host-vixl |