commit 795d78f4d04c8d007bf2bdf2ed4131379bcf19c7
author jeffhao <jeffhao@google.com> Fri Sep 30 18:34:35 2011 -0700
committer jeffhao <jeffhao@google.com> Fri Sep 30 18:34:35 2011 -0700
tree 9d6288a561f82997ddd60ee0109949a65807cb79
parent d2e0f90f0ab743743c4bb893b2a694b366b2b147

Old tests run with new system.

The tests are ported and run with the new system, though many currently
don't pass. Some of the tests also need additional fixing to run
properly.

Change-Id: I3263cf5dcb0fe064a3e6c02e4aa1bb9a067f64c7

test/etc/default-build

diff --git a/test/etc/default-build b/test/etc/default-build
index b8df442..dcc372a 100755
--- a/test/etc/default-build
+++ b/test/etc/default-build
@@ -26,7 +26,14 @@
 
 dx -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex \
     --dump-width=1000 classes
-zip test.jar classes.dex
+zip ${ANDROID_PRODUCT_OUT}/system/framework/test.jar classes.dex
+
+dex2oatd -Xms16m -Xmx16m \
+    --boot-dex-file=${ANDROID_PRODUCT_OUT}/system/framework/core.jar \
+    --boot=${ANDROID_PRODUCT_OUT}/system/framework/core.oat \
+    --dex-file=${ANDROID_PRODUCT_OUT}/system/framework/test.jar \
+    --image=${ANDROID_PRODUCT_OUT}/system/framework/test.oat \
+    --strip-prefix=${ANDROID_PRODUCT_OUT}
 
 if [ -r src-ex ]; then
     mkdir classes-ex
@@ -37,7 +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 test-ex.jar classes.dex
+    zip ${ANDROID_PRODUCT_OUT}/system/framework/test-ex.jar classes.dex
     mv classes.dex classes-ex.dex
     mv classes-1.dex classes.dex
+
+    dex2oatd -Xms16m -Xmx16m \
+        --boot-dex-file=${ANDROID_PRODUCT_OUT}/system/framework/core.jar \
+        --boot=${ANDROID_PRODUCT_OUT}/system/framework/core.oat \
+        --dex-file=${ANDROID_PRODUCT_OUT}/system/framework/test-ex.jar \
+        --image=${ANDROID_PRODUCT_OUT}/system/framework/test-ex.oat \
+        --strip-prefix=${ANDROID_PRODUCT_OUT}
 fi