commit 7b74608354c838dfc92753cc38c5ce6739bc0994
author Jeff Hao <jeffhao@google.com> Tue Nov 12 10:57:03 2013 -0800
committer Brian Carlstrom <bdc@google.com> Wed Nov 13 17:40:19 2013 -0800
tree 65325b818a0091db7b172ebbe307039db19238ba
parent 7bc9ec27bb47f48357dd20e6ce833e6830e27a92

Fix paths in starttests script.

(cherry picked from commit 17ca8233e8d60e799f163e3532eb09b5e5f860f9)

Change-Id: I274cbe98db76f48a377a044d8d40b693cba20899

tools/vm-tests-tf/etc/starttests

diff --git a/tools/vm-tests-tf/etc/starttests b/tools/vm-tests-tf/etc/starttests
index 6ec1701..0c8721b 100755
--- a/tools/vm-tests-tf/etc/starttests
+++ b/tools/vm-tests-tf/etc/starttests
@@ -57,10 +57,10 @@
     interpreter="portable"
 fi
 
-dalviktest=$progdir/../cts_dalviktests_tf
+dalviktest=$ANDROID_BUILD_TOP/out/host/common/obj/JAVA_LIBRARIES/vm-tests-tf_intermediates
 dalviktestdir=$dalviktest/tests
 dexcore=$dalviktest/tests/dot/junit/dexcore.jar
-scriptdata=$dalviktest/data/scriptdata
+scriptdata=$dalviktestdir/data/scriptdata
 report=$dalviktest/report.html
 curdate=`date`
 curmode=""
@@ -140,7 +140,7 @@
 if [ "$TARGET_SIMULATOR" = "true" ]; then
     echo -n ""
 else
-    adb push $dexcore /data/dexcore.jar >> /dev/null 2>&1
+    adb push $dexcore /data/local/tmp/dexcore.jar >> /dev/null 2>&1
 fi
 
 function classnameToJar()
@@ -189,13 +189,13 @@
                 echo "Dalvik VM failed, result=${RESULTCODE}" >> $datadir/dalvikout 2>&1
             fi
         else
-            classpath="/data/dexcore.jar"
+            classpath="/data/local/tmp/dexcore.jar"
             deps=${deps}" "${mainclass}
             pushedjars=""
             for dep in ${deps}; do
                 depJar=`classnameToJar ${dep}`
                 depFileName=`basename ${depJar}`
-                deviceFileName=/data/${depFileName}
+                deviceFileName=/data/local/tmp/${depFileName}
                 adb push ${depJar} ${deviceFileName} &> /dev/null
                 classpath=${classpath}:${deviceFileName}
                 pushedjars=${pushedjars}" "${deviceFileName}