Update run-test support for host

Change-Id: I716df88f1ab81f7afd689b9370be449729caf918

2 files changed, 21 insertions, 28 deletions

diff --git a/Android.mk b/Android.mk
index a7826e0264..a4e2797e84 100644
--- a/Android.mk
+++ b/Android.mk
@@ -112,6 +112,21 @@ tsan-test-art-host-gtest: $(ART_HOST_TEST_DEPENDENCIES)
 test-art-host-oat: $(ART_TEST_HOST_OAT_TARGETS)
 	@echo test-art-host-oat PASSED
 
+define declare-test-art-host-run-test
+.PHONY: test-art-host-run-test-$(1)
+test-art-host-run-test-$(1): $(ART_HOST_TEST_DEPENDENCIES) $(HOST_OUT_SHARED_LIBRARIES)/libarttest.so
+	art/test/run-test --host $(1)
+	@echo test-art-host-run-test-$(1) PASSED
+
+TEST_ART_HOST_RUN_TEST_TARGETS += test-art-host-run-test-$(1)
+endef
+
+$(foreach test, $(wildcard art/test/0*), $(eval $(call declare-test-art-host-run-test,$(notdir $(test)))))
+
+.PHONY: test-art-host-run-test
+test-art-host-run-test: $(TEST_ART_HOST_RUN_TEST_TARGETS)
+	@echo test-art-host-run-test PASSED
+
 ########################################################################
 # target test targets
 
diff --git a/test/etc/host-run-test-jar b/test/etc/host-run-test-jar
index 3ac26883cc..f424487125 100755
--- a/test/etc/host-run-test-jar
+++ b/test/etc/host-run-test-jar
@@ -57,35 +57,14 @@ while true; do
     fi
 done
 
-if [ "$OPTIMIZE" = "y" ]; then
-    if [ "$VERIFY" = "y" ]; then
-        DEX_OPTIMIZE="-Xdexopt:verified"
-    else
-        DEX_OPTIMIZE="-Xdexopt:all"
-    fi
-    msg "Performing optimizations"
-else
-    DEX_OPTIMIZE="-Xdexopt:none"
-    msg "Skipping optimizations"
-fi
-
-if [ "$VERIFY" = "y" ]; then
-    DEX_VERIFY=""
-    msg "Performing verification"
-else
-    DEX_VERIFY="-Xverify:none"
-    msg "Skipping verification"
-fi
-
 msg "------------------------------"
 
 HOSTBASE="${ANDROID_BUILD_TOP}/out/host"
-BASE="$OUT" # from build environment
 DATA_DIR=/tmp
 DEBUG_OPTS="-Xcheck:jni -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n"
 
-if [ ! -d $DATA_DIR/dalvik-cache ]; then
-    mkdir -p $DATA_DIR/dalvik-cache
+if [ ! -d $DATA_DIR/art-cache ]; then
+    mkdir -p $DATA_DIR/art-cache
     [[ $? -ne 0 ]] && exit
 fi
 
@@ -100,9 +79,7 @@ export ANDROID_ROOT="${HOSTBASE}/linux-x86"
 export LD_LIBRARY_PATH="${ANDROID_ROOT}/lib"
 export DYLD_LIBRARY_PATH="${ANDROID_ROOT}/lib"
 
-exe="${ANDROID_ROOT}/bin/dalvikvm"
-framework="${BASE}/system/framework"
-bpath="${framework}/core.jar:${framework}/ext.jar:${framework}/framework.jar"
+exe="${ANDROID_ROOT}/bin/oatexecd"
 
 if [ "$DEBUG" = "y" ]; then
     PORT=8000
@@ -115,6 +92,7 @@ if [ "$GDB" = "y" ]; then
     gdbargs="--args $exe"
 fi
 
-$INVOKE_WITH $gdb $exe $gdbargs "-Xbootclasspath:${bpath}" \
-    $DEX_VERIFY $DEX_OPTIMIZE $DEX_DEBUG ${DEBUG_OPTS} -ea \
+cd $ANDROID_BUILD_TOP
+$INVOKE_WITH $gdb $exe $gdbargs -Ximage:$ANDROID_ROOT/framework/core.art \
+    $DEX_DEBUG ${DEBUG_OPTS} \
     -cp test.jar Main "$@"