Improve run-test to use new directory for each run

This ensures we rerun dex2oat on each test run. We also now cleanup better on host and target.

Change-Id: I2b48c45d8a4bf7629aa6b538556fcf78fc22d0dc

3 files changed, 24 insertions, 24 deletions

diff --git a/test/etc/host-run-test-jar b/test/etc/host-run-test-jar
index e062a18..5828822 100755
--- a/test/etc/host-run-test-jar
+++ b/test/etc/host-run-test-jar
@@ -59,11 +59,8 @@ done
 
 msg "------------------------------"
 
-DATA_DIR=/tmp
-if [ ! -d $DATA_DIR/art-cache ]; then
-    mkdir -p $DATA_DIR/art-cache
-    [[ $? -ne 0 ]] && exit
-fi
+mkdir $DEX_LOCATION/art-cache
+[[ $? -ne 0 ]] && exit
 
 export ANDROID_PRINTF_LOG=brief
 if [ "$DEV_MODE" = "y" ]; then
@@ -71,7 +68,7 @@ if [ "$DEV_MODE" = "y" ]; then
 else
     export ANDROID_LOG_TAGS='*:s'
 fi
-export ANDROID_DATA="$DATA_DIR"
+export ANDROID_DATA="$DEX_LOCATION"
 export ANDROID_ROOT="${ANDROID_HOST_OUT}"
 export LD_LIBRARY_PATH="${ANDROID_ROOT}/lib"
 export DYLD_LIBRARY_PATH="${ANDROID_ROOT}/lib"
diff --git a/test/etc/push-and-run-test-jar b/test/etc/push-and-run-test-jar
index 31c368d..8e53529 100755
--- a/test/etc/push-and-run-test-jar
+++ b/test/etc/push-and-run-test-jar
@@ -91,17 +91,13 @@ fi
 msg "------------------------------"
 
 if [ "$QUIET" = "n" ]; then
-  adb shell mkdir /data/run-test
-  adb push $TEST_NAME.jar /data/run-test
-  adb push $TEST_NAME.jar.oat /data/run-test
-  adb push $TEST_NAME-ex.jar /data/run-test
-  adb push $TEST_NAME-ex.jar.oat /data/run-test
+  adb shell mkdir -p $DEX_LOCATION
+  adb push $TEST_NAME.jar $DEX_LOCATION
+  adb push $TEST_NAME-ex.jar $DEX_LOCATION
 else
-  adb shell mkdir /data/run-test >/dev/null 2>&1
-  adb push $TEST_NAME.jar /data/run-test >/dev/null 2>&1
-  adb push $TEST_NAME.jar.oat /data/run-test >/dev/null 2>&1
-  adb push $TEST_NAME-ex.jar /data/run-test >/dev/null 2>&1
-  adb push $TEST_NAME-ex.jar.oat /data/run-test >/dev/null 2>&1
+  adb shell mkdir -p $DEX_LOCATION >/dev/null 2>&1
+  adb push $TEST_NAME.jar $DEX_LOCATION >/dev/null 2>&1
+  adb push $TEST_NAME-ex.jar $DEX_LOCATION >/dev/null 2>&1
 fi
 
 if [ "$DEBUG" = "y" ]; then
@@ -118,11 +114,8 @@ fi
 
 JNI_OPTS="-Xjnigreflimit:256 -Xcheck:jni"
 
-cmdline="cd /data; export DEX_LOCATION=$DEX_LOCATION; $INVOKE_WITH $OATEXEC $ZYGOTE \
-    $JNI_OPTS $DEBUG_OPTS \
-    -Ximage:/data/art-test/core.art \
-    -cp /data/run-test/$TEST_NAME.jar \
-    Main"
+cmdline="cd $DEX_LOCATION && mkdir art-cache && export ANDROID_DATA=$DEX_LOCATION && export DEX_LOCATION=$DEX_LOCATION && \
+    $INVOKE_WITH $OATEXEC $ZYGOTE $JNI_OPTS $DEBUG_OPTS -Ximage:/data/art-test/core.art -cp $DEX_LOCATION/$TEST_NAME.jar Main"
 if [ "$DEV_MODE" = "y" ]; then
   echo $cmdline "$@"
 fi
diff --git a/test/run-test b/test/run-test
index 75aeeff..38f8f83 100755
--- a/test/run-test
+++ b/test/run-test
@@ -32,13 +32,14 @@ progdir=`dirname "${prog}"`
 cd "${progdir}"
 progdir=`pwd`
 prog="${progdir}"/`basename "${prog}"`
-tmp_dir="/tmp/test-$$"
+test_dir="test-$$"
+tmp_dir="/tmp/${test_dir}"
 
 export JAVA="java"
 export JAVAC="javac -g -target 1.5"
 export RUN="${progdir}/etc/push-and-run-test-jar"
 export IMAGE=${ANDROID_PRODUCT_OUT}/data/art-test/core.art
-export DEX_LOCATION=/data/run-test
+export DEX_LOCATION=/data/run-test/${test_dir}
 
 info="info.txt"
 build="build"
@@ -48,6 +49,7 @@ output="output.txt"
 build_output="build-output.txt"
 run_args="--quiet"
 
+host_mode="no"
 dev_mode="no"
 update_mode="no"
 debug_mode="no"
@@ -55,6 +57,7 @@ usage="no"
 
 while true; do
     if [ "x$1" = "x--host" ]; then
+        host_mode="yes"
         RUN="${progdir}/etc/host-run-test-jar"
         IMAGE=${ANDROID_HOST_OUT}/framework/core.art
         DEX_LOCATION=$tmp_dir
@@ -235,6 +238,9 @@ fi
 if [ "$good" = "yes" ]; then
     cd "$oldwd"
     rm -rf "$tmp_dir"
+    if [ "$host_mode" = "no" ]; then
+        adb shell rm -r $DEX_LOCATION
+    fi
     exit 0
 fi
 
@@ -249,7 +255,11 @@ fi
         echo '####################'
         echo ' '
     fi
-    echo "${TEST_NAME} files left in ${tmp_dir}"
+    echo "${TEST_NAME} files left in ${tmp_dir} on host"
+    if [ "$host_mode" = "yes" ]; then
+        echo "and in ${DEX_LOCATION} on target"
+    fi
+
 ) 1>&2
 
 exit 1