diff options
author | Brian Carlstrom <bdc@google.com> | 2012-06-04 15:37:25 -0700 |
---|---|---|
committer | Brian Carlstrom <bdc@google.com> | 2012-06-04 15:38:29 -0700 |
commit | 2ab7f486ba73b2846bdbdde65cc2d41f62a26015 (patch) | |
tree | f9426788322cf7a7ee20a6665f72cabbf5a838d7 | |
parent | 2792fade8cb6554f81008b7635cec6ed0e914b3c (diff) | |
download | art-2ab7f486ba73b2846bdbdde65cc2d41f62a26015.zip art-2ab7f486ba73b2846bdbdde65cc2d41f62a26015.tar.gz art-2ab7f486ba73b2846bdbdde65cc2d41f62a26015.tar.bz2 |
Remove explicit dex2oat calls from run-test
Change-Id: If7222e834602bfc1232ac199ab81e7c09c058f43
-rw-r--r-- | Android.mk | 1 | ||||
-rw-r--r-- | test/003-omnibus-opcodes/build | 1 | ||||
-rw-r--r-- | test/022-interface/build | 1 | ||||
-rw-r--r-- | test/023-many-interfaces/build | 1 | ||||
-rw-r--r-- | test/056-const-string-jumbo/build | 1 | ||||
-rw-r--r-- | test/085-old-style-inner-class/build | 1 | ||||
-rwxr-xr-x | test/etc/default-build | 3 | ||||
-rwxr-xr-x | test/etc/host-run-test-jar | 1 | ||||
-rwxr-xr-x | test/run-test | 2 |
9 files changed, 2 insertions, 10 deletions
@@ -264,6 +264,7 @@ clean-oat: rm -f $(TARGET_OUT_APPS)/*.oat rm -f $(TARGET_OUT_INTERMEDIATES)/JAVA_LIBRARIES/*_intermediates/javalib.jar.oat rm -f $(TARGET_OUT_INTERMEDIATES)/APPS/*_intermediates/package.apk.oat + rm -rf /tmp/art-cache/*.oat adb remount adb shell rm $(ART_NATIVETEST_DIR)/*.oat adb shell rm $(ART_NATIVETEST_DIR)/*.art diff --git a/test/003-omnibus-opcodes/build b/test/003-omnibus-opcodes/build index bb9c4f8..4bc2f84 100644 --- a/test/003-omnibus-opcodes/build +++ b/test/003-omnibus-opcodes/build @@ -24,4 +24,3 @@ ${JAVAC} -d classes `find src2 -name '*.java'` dx -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex classes zip $TEST_NAME.jar classes.dex -dex2oatd --boot-image=$IMAGE --dex-file=$TEST_NAME.jar --dex-location=$DEX_LOCATION/$TEST_NAME.jar --oat-file=$TEST_NAME.jar.oat $DEX2OAT_ARGS diff --git a/test/022-interface/build b/test/022-interface/build index 1841f0622d..36738c3 100644 --- a/test/022-interface/build +++ b/test/022-interface/build @@ -21,4 +21,3 @@ set -e # issue when interfaces override methods in Object dx --debug --dex --dump-to=classes.lst --output=classes.dex classes zip $TEST_NAME.jar classes.dex -dex2oatd --boot-image=$IMAGE --dex-file=$TEST_NAME.jar --dex-location=$DEX_LOCATION/$TEST_NAME.jar --oat-file=$TEST_NAME.jar.oat $DEX2OAT_ARGS diff --git a/test/023-many-interfaces/build b/test/023-many-interfaces/build index 5d981f4..618d85e 100644 --- a/test/023-many-interfaces/build +++ b/test/023-many-interfaces/build @@ -26,4 +26,3 @@ ${JAVAC} -d classes src/*.java dx --debug --dex --dump-to=classes.lst --output=classes.dex classes zip $TEST_NAME.jar classes.dex -dex2oatd --boot-image=$IMAGE --dex-file=$TEST_NAME.jar --dex-location=$DEX_LOCATION/$TEST_NAME.jar --oat-file=$TEST_NAME.jar.oat $DEX2OAT_ARGS diff --git a/test/056-const-string-jumbo/build b/test/056-const-string-jumbo/build index b3d9aad..ce71acd 100644 --- a/test/056-const-string-jumbo/build +++ b/test/056-const-string-jumbo/build @@ -44,4 +44,3 @@ ${JAVAC} -d classes src/*.java dx -JXmx500m --debug --dex --no-optimize --positions=none --no-locals --dump-to=classes.lst --output=classes.dex classes zip $TEST_NAME.jar classes.dex -dex2oatd --boot-image=$IMAGE --dex-file=$TEST_NAME.jar --dex-location=$DEX_LOCATION/$TEST_NAME.jar --oat-file=$TEST_NAME.jar.oat $DEX2OAT_ARGS diff --git a/test/085-old-style-inner-class/build b/test/085-old-style-inner-class/build index b771e6c..9e77013 100644 --- a/test/085-old-style-inner-class/build +++ b/test/085-old-style-inner-class/build @@ -26,4 +26,3 @@ ${JAVAC} -source 1.4 -target 1.4 -d classes `find src -name '*.java'` dx --debug --dex --dump-to=classes.lst --output=classes.dex --dump-width=1000 classes 2>/dev/null zip $TEST_NAME.jar classes.dex -dex2oatd --boot-image=$IMAGE --dex-file=$TEST_NAME.jar --dex-location=$DEX_LOCATION/$TEST_NAME.jar --oat-file=$TEST_NAME.jar.oat $DEX2OAT_ARGS diff --git a/test/etc/default-build b/test/etc/default-build index 01bac6b..aefb626 100755 --- a/test/etc/default-build +++ b/test/etc/default-build @@ -27,8 +27,6 @@ fi dx -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex --dump-width=1000 classes zip $TEST_NAME.jar classes.dex -dex2oatd --boot-image=$IMAGE --dex-file=$TEST_NAME.jar --dex-location=$DEX_LOCATION/$TEST_NAME.jar --oat-file=$TEST_NAME.jar.oat $DEX2OAT_ARGS - if [ -r src-ex ]; then mkdir classes-ex ${JAVAC} -d classes-ex -cp classes `find src-ex -name '*.java'` @@ -38,7 +36,6 @@ if [ -r src-ex ]; then mv classes.dex classes-1.dex mv classes-ex.dex classes.dex zip $TEST_NAME-ex.jar classes.dex - dex2oatd --boot-image=$IMAGE --dex-file=$TEST_NAME-ex.jar --dex-location=$DEX_LOCATION/$TEST_NAME-ex.jar --oat-file=$TEST_NAME-ex.jar.oat $DEX2OAT_ARGS mv classes.dex classes-ex.dex mv classes-1.dex classes.dex fi diff --git a/test/etc/host-run-test-jar b/test/etc/host-run-test-jar index 30a6721..e062a18 100755 --- a/test/etc/host-run-test-jar +++ b/test/etc/host-run-test-jar @@ -75,6 +75,7 @@ export ANDROID_DATA="$DATA_DIR" export ANDROID_ROOT="${ANDROID_HOST_OUT}" export LD_LIBRARY_PATH="${ANDROID_ROOT}/lib" export DYLD_LIBRARY_PATH="${ANDROID_ROOT}/lib" +unset ANDROID_PRODUCT_OUT # avoid defaulting dex2oat --host-prefix to target output exe="${ANDROID_ROOT}/bin/oatexecd" diff --git a/test/run-test b/test/run-test index 3163424..75aeeff 100755 --- a/test/run-test +++ b/test/run-test @@ -39,7 +39,6 @@ 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 DEX2OAT_ARGS="--instruction-set=arm" info="info.txt" build="build" @@ -59,7 +58,6 @@ while true; do RUN="${progdir}/etc/host-run-test-jar" IMAGE=${ANDROID_HOST_OUT}/framework/core.art DEX_LOCATION=$tmp_dir - DEX2OAT_ARGS="--instruction-set=x86 --host-prefix=$ANDROID_BUILD_TOP/" shift elif [ "x$1" = "x--jvm" ]; then RUN="${progdir}/etc/reference-run-test-classes" |