diff options
Diffstat (limited to 'test/Android.run-test.mk')
| -rw-r--r-- | test/Android.run-test.mk | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 41c8da6f59..c764414921 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -437,7 +437,7 @@ endif # Create a rule to build and run a tests following the form: # test-art-{1: host or target}-run-test-{2: debug ndebug}-{3: prebuild no-prebuild no-dex2oat}- -# {4: interpreter default optimizing}-{5: relocate no-relocate relocate-no-patchoat}- +# {4: interpreter default optimizing jit}-{5: relocate no-relocate relocate-no-patchoat}- # {6: trace or no-trace}-{7: gcstress gcverify cms}-{8: forcecopy checkjni jni}- # {9: no-image image picimage}-{10: pictest nopictest}-{11: test name}{12: 32 or 64} define define-test-art-run-test @@ -501,7 +501,7 @@ define define-test-art-run-test run_test_options += --quick else ifeq ($(4),jit) - test_groups += ART_RUN_TEST_$$(uc_host_or_target)_DEFAULT_RULES + test_groups += ART_RUN_TEST_$$(uc_host_or_target)_JIT_RULES run_test_options += --jit else $$(error found $(4) expected $(COMPILER_TYPES)) @@ -569,32 +569,38 @@ define define-test-art-run-test endif endif endif + ifeq ($(4),jit) + # Use interpreter image for JIT. + image_suffix := interpreter + else + image_suffix := $(4) + endif ifeq ($(9),no-image) test_groups += ART_RUN_TEST_$$(uc_host_or_target)_NO_IMAGE_RULES run_test_options += --no-image # Add the core dependency. This is required for pre-building. ifeq ($(1),host) - prereq_rule += $(HOST_CORE_IMAGE_$(4)_no-pic_$(12)) + prereq_rule += $(HOST_CORE_IMAGE_$(image_suffix)_no-pic_$(12)) else - prereq_rule += $(TARGET_CORE_IMAGE_$(4)_no-pic_$(12)) + prereq_rule += $(TARGET_CORE_IMAGE_$(image_suffix)_no-pic_$(12)) endif else ifeq ($(9),image) test_groups += ART_RUN_TEST_$$(uc_host_or_target)_IMAGE_RULES # Add the core dependency. ifeq ($(1),host) - prereq_rule += $(HOST_CORE_IMAGE_$(4)_no-pic_$(12)) + prereq_rule += $(HOST_CORE_IMAGE_$(image_suffix)_no-pic_$(12)) else - prereq_rule += $(TARGET_CORE_IMAGE_$(4)_no-pic_$(12)) + prereq_rule += $(TARGET_CORE_IMAGE_$(image_suffix)_no-pic_$(12)) endif else ifeq ($(9),picimage) test_groups += ART_RUN_TEST_$$(uc_host_or_target)_PICIMAGE_RULES run_test_options += --pic-image ifeq ($(1),host) - prereq_rule += $(HOST_CORE_IMAGE_$(4)_pic_$(12)) + prereq_rule += $(HOST_CORE_IMAGE_$(image_suffix)_pic_$(12)) else - prereq_rule += $(TARGET_CORE_IMAGE_$(4)_pic_$(12)) + prereq_rule += $(TARGET_CORE_IMAGE_$(image_suffix)_pic_$(12)) endif else $$(error found $(9) expected $(IMAGE_TYPES)) |