summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2014-05-13 21:05:04 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-05-13 21:05:04 +0000
commit2757fa0194d96f18c8a276c76008a3aa0fe1df9f (patch)
treeab7e5e25c9e0ff1453ec28be7b37d7ff4965f2fe
parenta47dcbf4bc226b5bbf30618fc052e7c79672af7a (diff)
parent3c0335735e9e8963003eeabb984e5208731d972e (diff)
Merge "ART: Run cctest_vixl in test-art-host"
-rw-r--r--Android.mk15
1 files changed, 14 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index fe631d9c4e..2196d59108 100644
--- a/Android.mk
+++ b/Android.mk
@@ -150,9 +150,22 @@ test-art-run-test: test-art-host-run-test test-art-target-run-test
########################################################################
# host test targets
+.PHONY: test-art-host-vixl
+ifneq ($(BUILD_HOST_64bit),)
+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.
+
+endif
+
# "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: test-art-host-gtest test-art-host-oat test-art-host-run-test test-art-host-vixl
@echo test-art-host PASSED
.PHONY: test-art-host-interpreter