commit 37476bd64b75c1aff8c3a5c7cadb424e37f25869
author Elliott Hughes <enh@google.com> Wed Feb 01 12:07:37 2012 -0800
committer Elliott Hughes <enh@google.com> Wed Feb 01 12:22:06 2012 -0800
tree 51d83f019f3fcbe83adb280b7a95baf1b8092bf4
parent 1c5eb704b61511cdc649cad032d29940857c9fe9

Fix a few bugs in push-and-run-test-jar.

Simon says it's "adb shell mkdir", not "adb mkdir" (which was silently failing).

We shouldn't be putting test .jar and .oat files in /system/framework (silently
causing --quiet to use out of date code).

The runtime has been looking for X.jar.oat given X.jar for some time now (which
was silently causing all modes to use out of date code in conjunction with a
to-be-fixed bug that's preventing us from recognizing that the .oat file's
checksum is out of date).

Change-Id: I2421878159f24cc7564faa105a3e795c09929158

test/etc/push-and-run-test-jar

diff --git a/test/etc/push-and-run-test-jar b/test/etc/push-and-run-test-jar
index ffb0bf6..d2e9790 100755
--- a/test/etc/push-and-run-test-jar
+++ b/test/etc/push-and-run-test-jar
@@ -90,17 +90,17 @@
 msg "------------------------------"
 
 if [ "$QUIET" = "n" ]; then
-  adb mkdir /data/art-test
-  adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar /system/framework
-  adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat /system/framework
+  adb shell mkdir /data/art-test
+  adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar /data/art-test
+  adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar.oat /data/art-test
   adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.jar /data/art-test
-  adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.oat /data/art-test
+  adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.jar.oat /data/art-test
 else
-  adb mkdir /data/art-test >/dev/null 2>&1
+  adb shell mkdir /data/art-test >/dev/null 2>&1
   adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar /data/art-test >/dev/null 2>&1
-  adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat /data/art-test >/dev/null 2>&1
+  adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar.oat /data/art-test >/dev/null 2>&1
   adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.jar /data/art-test >/dev/null 2>&1
-  adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.oat /data/art-test >/dev/null 2>&1
+  adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.jar.oat /data/art-test >/dev/null 2>&1
 fi
 
 if [ "$DEBUG" = "y" ]; then