diff options
| author | Ian Rogers <irogers@google.com> | 2014-05-18 13:03:52 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-05-18 13:03:52 -0700 |
| commit | 7a4c1c1533f6f25303752525424b6244e4c9b739 (patch) | |
| tree | accd46fcf10ea9882f9ae3aa13170aaba3c76abc /Android.mk | |
| parent | 8f0776768712b2021aa8fb649b51017b9f0fc7a9 (diff) | |
| download | art-7a4c1c1533f6f25303752525424b6244e4c9b739.zip art-7a4c1c1533f6f25303752525424b6244e4c9b739.tar.gz art-7a4c1c1533f6f25303752525424b6244e4c9b739.tar.bz2 | |
Make vixl tests a dependency in the vixl makefile.
This fixes run test-art-host for 64-bit hosts.
Depends upon: https://android-review.googlesource.com/#/c/94999/
Change-Id: Ic595b7a5f6c5ddb86b5b4c20e626baba6ac7a28e
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 17 |
1 files changed, 8 insertions, 9 deletions
@@ -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 |