diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-02-27 13:21:15 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-02-27 14:26:29 -0800 |
| commit | e2a12c0504cdd75e27c9c6567ceebdc124d344d6 (patch) | |
| tree | 1db91db9d04e4ab1801a6edcfe20a6e5479c4d9b /test | |
| parent | 02abb5075f3085e69c0c81fb5724c066f6c845b7 (diff) | |
| download | art-e2a12c0504cdd75e27c9c6567ceebdc124d344d6.tar.gz art-e2a12c0504cdd75e27c9c6567ceebdc124d344d6.tar.bz2 art-e2a12c0504cdd75e27c9c6567ceebdc124d344d6.zip | |
Change JIT tests to use interpreter image
Bug: 19528920
Change-Id: I079cfcca7bb57e492c82a44f104e41228cb33b4f
Diffstat (limited to 'test')
| -rw-r--r-- | test/Android.run-test.mk | 18 | ||||
| -rwxr-xr-x | test/run-test | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index e5a07d4cfe..c764414921 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -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)) diff --git a/test/run-test b/test/run-test index 888e4ed280..52f5e0c401 100755 --- a/test/run-test +++ b/test/run-test @@ -195,7 +195,7 @@ while true; do shift elif [ "x$1" = "x--jit" ]; then run_args="${run_args} --jit" - image_suffix="-jit" + image_suffix="-interpreter" shift elif [ "x$1" = "x--optimizing" ]; then run_args="${run_args} -Xcompiler-option --compiler-backend=Optimizing" |