diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-02-27 20:55:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-27 20:55:16 +0000 |
| commit | 02abb5075f3085e69c0c81fb5724c066f6c845b7 (patch) | |
| tree | aca6801eaeef9176bf9ad2e62c7db8f2bc4f993d | |
| parent | 242026e246a8b9efe098a0cce008fd525e011e5b (diff) | |
| parent | 721f3a817884c1c4cf30cea2bbb337738745a74d (diff) | |
| download | art-02abb5075f3085e69c0c81fb5724c066f6c845b7.zip art-02abb5075f3085e69c0c81fb5724c066f6c845b7.tar.gz art-02abb5075f3085e69c0c81fb5724c066f6c845b7.tar.bz2 | |
Merge "Fix jit tests"
| -rw-r--r-- | Android.mk | 13 | ||||
| -rw-r--r-- | build/Android.oat.mk | 2 | ||||
| -rwxr-xr-x | test/run-test | 1 |
3 files changed, 16 insertions, 0 deletions
@@ -281,6 +281,11 @@ test-art-target-optimizing: test-art-target-run-test-optimizing test-art-target-interpreter: test-art-target-run-test-interpreter $(hide) $(call ART_TEST_PREREQ_FINISHED,$@) +# All target tests that run solely on the jit. +.PHONY: test-art-target-jit +test-art-target-jit: test-art-target-run-test-jit + $(hide) $(call ART_TEST_PREREQ_FINISHED,$@) + # Primary target architecture variants: .PHONY: test-art-target$(ART_PHONY_TEST_TARGET_SUFFIX) test-art-target$(ART_PHONY_TEST_TARGET_SUFFIX): test-art-target-gtest$(ART_PHONY_TEST_TARGET_SUFFIX) \ @@ -299,6 +304,10 @@ test-art-target-optimizing$(ART_PHONY_TEST_TARGET_SUFFIX): test-art-target-run-t test-art-target-interpreter$(ART_PHONY_TEST_TARGET_SUFFIX): test-art-target-run-test-interpreter$(ART_PHONY_TEST_TARGET_SUFFIX) $(hide) $(call ART_TEST_PREREQ_FINISHED,$@) +.PHONY: test-art-target-jit$(ART_PHONY_TEST_TARGET_SUFFIX) +test-art-target-jit$(ART_PHONY_TEST_TARGET_SUFFIX): test-art-target-run-test-jit$(ART_PHONY_TEST_TARGET_SUFFIX) + $(hide) $(call ART_TEST_PREREQ_FINISHED,$@) + # Secondary target architecture variants: ifdef TARGET_2ND_ARCH .PHONY: test-art-target$(2ND_ART_PHONY_TEST_TARGET_SUFFIX) @@ -317,6 +326,10 @@ test-art-target-optimizing$(2ND_ART_PHONY_TEST_TARGET_SUFFIX): test-art-target-r .PHONY: test-art-target-interpreter$(2ND_ART_PHONY_TEST_TARGET_SUFFIX) test-art-target-interpreter$(2ND_ART_PHONY_TEST_TARGET_SUFFIX): test-art-target-run-test-interpreter$(2ND_ART_PHONY_TEST_TARGET_SUFFIX) $(hide) $(call ART_TEST_PREREQ_FINISHED,$@) + +.PHONY: test-art-target-jit$(2ND_ART_PHONY_TEST_TARGET_SUFFIX) +test-art-target-jit$(2ND_ART_PHONY_TEST_TARGET_SUFFIX): test-art-target-run-test-jit$(2ND_ART_PHONY_TEST_TARGET_SUFFIX) + $(hide) $(call ART_TEST_PREREQ_FINISHED,$@) endif endif # art_test_bother diff --git a/build/Android.oat.mk b/build/Android.oat.mk index 22ecb01..894f98f 100644 --- a/build/Android.oat.mk +++ b/build/Android.oat.mk @@ -271,12 +271,14 @@ endef $(eval $(call create-core-oat-target-rule-combination,default,,)) $(eval $(call create-core-oat-target-rule-combination,optimizing,,)) $(eval $(call create-core-oat-target-rule-combination,interpreter,,)) +$(eval $(call create-core-oat-target-rule-combination,jit,,)) valgrindTARGET_CORE_IMG_OUTS := valgrindTARGET_CORE_OAT_OUTS := $(eval $(call create-core-oat-target-rule-combination,default,valgrind,32)) $(eval $(call create-core-oat-target-rule-combination,optimizing,valgrind,32)) $(eval $(call create-core-oat-target-rule-combination,interpreter,valgrind,32)) +$(eval $(call create-core-oat-target-rule-combination,jit,valgrind,32)) valgrind-test-art-host-dex2oat-target: $(valgrindTARGET_CORE_IMG_OUTS) diff --git a/test/run-test b/test/run-test index 8bc4151..888e4ed 100755 --- a/test/run-test +++ b/test/run-test @@ -195,6 +195,7 @@ while true; do shift elif [ "x$1" = "x--jit" ]; then run_args="${run_args} --jit" + image_suffix="-jit" shift elif [ "x$1" = "x--optimizing" ]; then run_args="${run_args} -Xcompiler-option --compiler-backend=Optimizing" |