commit 8cbc8bc716d7a47019ad14403920c72547b2fb96
author Elliott Hughes <enh@google.com> Tue Oct 04 11:19:45 2011 -0700
committer Elliott Hughes <enh@google.com> Tue Oct 04 11:24:27 2011 -0700
tree 58f2a58cb52de0a9ea36eeb8e4ddd6a0861b698a
parent 58ae9416e197ae68ed12ed43d87407d4dfb15093

Use a test-specific name for each generated file.

This lets us run multiple tests in parallel (and know what we've got lying
around on our devices).

Change-Id: I90ecc4ceaae0ee4b323d861c2b408e2944a2f8c1

test/etc/default-build

diff --git a/test/etc/default-build b/test/etc/default-build
index 0ef8ba8..a2e9066 100755
--- a/test/etc/default-build
+++ b/test/etc/default-build
@@ -26,13 +26,13 @@
 
 dx -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex \
     --dump-width=1000 classes
-zip ${ANDROID_PRODUCT_OUT}/system/framework/test.jar classes.dex
+zip ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.jar classes.dex
 
 dex2oatd -Xms16m -Xmx16m \
     --boot-image=${ANDROID_PRODUCT_OUT}/system/framework/core.art \
-    --dex-file=${ANDROID_PRODUCT_OUT}/system/framework/test.jar \
-    --oat=${ANDROID_PRODUCT_OUT}/system/framework/test.oat \
-    --image=${ANDROID_PRODUCT_OUT}/system/framework/test.art \
+    --dex-file=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.jar \
+    --oat=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.oat \
+    --image=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.art \
     --host-prefix=${ANDROID_PRODUCT_OUT}
 
 if [ -r src-ex ]; then
@@ -44,14 +44,14 @@
     # quick shuffle so that the stored name is "classes.dex"
     mv classes.dex classes-1.dex
     mv classes-ex.dex classes.dex
-    zip ${ANDROID_PRODUCT_OUT}/system/framework/test-ex.jar classes.dex
+    zip ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.jar classes.dex
     mv classes.dex classes-ex.dex
     mv classes-1.dex classes.dex
 
     dex2oatd -Xms16m -Xmx16m \
         --boot-image=${ANDROID_PRODUCT_OUT}/system/framework/core.art \
-        --dex-file=${ANDROID_PRODUCT_OUT}/system/framework/test-ex.jar \
-        --oat=${ANDROID_PRODUCT_OUT}/system/framework/test-ex.oat \
-        --image=${ANDROID_PRODUCT_OUT}/system/framework/test-ex.art \
+        --dex-file=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.jar \
+        --oat=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.oat \
+        --image=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.art \
         --host-prefix=${ANDROID_PRODUCT_OUT}
 fi

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 0d4e3b4..8bbf8d8 100755
--- a/test/etc/push-and-run-test-jar
+++ b/test/etc/push-and-run-test-jar
@@ -106,19 +106,19 @@
 msg "------------------------------"
 
 if [ "$QUIET" = "n" ]; then
-    adb push ${ANDROID_PRODUCT_OUT}/system/framework/test.jar /system/framework
-    adb push ${ANDROID_PRODUCT_OUT}/system/framework/test.oat /system/framework
-    adb push ${ANDROID_PRODUCT_OUT}/system/framework/test.art /system/framework
-    adb push ${ANDROID_PRODUCT_OUT}/system/framework/test-ex.jar /system/framework
-    adb push ${ANDROID_PRODUCT_OUT}/system/framework/test-ex.oat /system/framework
-    adb push ${ANDROID_PRODUCT_OUT}/system/framework/test-ex.art /system/framework
+  adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.jar /system/framework
+  adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.oat /system/framework
+  adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.art /system/framework
+  adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.jar /system/framework
+  adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.oat /system/framework
+  adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.art /system/framework
 else
-    adb push ${ANDROID_PRODUCT_OUT}/system/framework/test.jar /system/framework >/dev/null 2>&1
-    adb push ${ANDROID_PRODUCT_OUT}/system/framework/test.oat /system/framework >/dev/null 2>&1
-    adb push ${ANDROID_PRODUCT_OUT}/system/framework/test.art /system/framework >/dev/null 2>&1
-    adb push ${ANDROID_PRODUCT_OUT}/system/framework/test-ex.jar /system/framework >/dev/null 2>&1
-    adb push ${ANDROID_PRODUCT_OUT}/system/framework/test-ex.oat /system/framework >/dev/null 2>&1
-    adb push ${ANDROID_PRODUCT_OUT}/system/framework/test-ex.art /system/framework >/dev/null 2>&1
+  adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.jar /system/framework >/dev/null 2>&1
+  adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.oat /system/framework >/dev/null 2>&1
+  adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.art /system/framework >/dev/null 2>&1
+  adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.jar /system/framework >/dev/null 2>&1
+  adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.oat /system/framework >/dev/null 2>&1
+  adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.art /system/framework >/dev/null 2>&1
 fi
 
 if [ "$DEBUG" = "y" ]; then
@@ -132,16 +132,17 @@
 fi
 
 if [ "$ZYGOTE" = "y" ]; then
-    adb shell cd /data \; dvz -classpath test.jar Main "$@"
+  adb shell cd /data \; dvz -classpath $TEST_NAME.jar Main "$@"
 else
-    cmdline="cd /data; oatexecd \
+  cmdline="cd /data; oatexecd \
       -Ximage:/system/framework/core.art \
-      -Ximage:/system/framework/test.art Main"
-    #cmdline="cd /data; dalvikvm $DEX_VERIFY $DEX_OPTIMIZE $DEX_DEBUG \
-    #    $GC_OPTS -cp test.jar -Xint:${INTERP} -ea Main"
-    if [ "$DEV_MODE" = "y" ]; then
-        echo $cmdline "$@"
-    fi
+      -Ximage:/system/framework/$TEST_NAME.art \
+      Main"
+  #cmdline="cd /data; dalvikvm $DEX_VERIFY $DEX_OPTIMIZE $DEX_DEBUG \
+  #    $GC_OPTS -cp test.jar -Xint:${INTERP} -ea Main"
+  if [ "$DEV_MODE" = "y" ]; then
+    echo $cmdline "$@"
+  fi
 
-    adb shell $cmdline "$@"
+  adb shell $cmdline "$@"
 fi