commit e2a12c0504cdd75e27c9c6567ceebdc124d344d6
author Mathieu Chartier <mathieuc@google.com> Fri Feb 27 13:21:15 2015 -0800
committer Mathieu Chartier <mathieuc@google.com> Fri Feb 27 14:26:29 2015 -0800
tree 1db91db9d04e4ab1801a6edcfe20a6e5479c4d9b
parent 02abb5075f3085e69c0c81fb5724c066f6c845b7

Change JIT tests to use interpreter image

Bug: 19528920
Change-Id: I079cfcca7bb57e492c82a44f104e41228cb33b4f

test/Android.run-test.mk

diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index e5a07d4..c764414 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -569,32 +569,38 @@
       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))