summaryrefslogtreecommitdiffstats
path: root/test/085-old-style-inner-class
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2012-03-06 22:56:41 -0800
committerBrian Carlstrom <bdc@google.com>2012-03-06 22:56:53 -0800
commit78325a44fbbdfbf47c9f1bd3166afcb71465a013 (patch)
treea0c56c1b792c44a4d4bc041104df1c08a05c9926 /test/085-old-style-inner-class
parent37c44442a0f1b3ae5f95e40d455022bcafb566e4 (diff)
downloadart-78325a44fbbdfbf47c9f1bd3166afcb71465a013.zip
art-78325a44fbbdfbf47c9f1bd3166afcb71465a013.tar.gz
art-78325a44fbbdfbf47c9f1bd3166afcb71465a013.tar.bz2
Fix 071-dexfile by having run-test use a unique directory
If userdata.img is flashed, the /data/art-test is owned by the system user. However, 071 requires the directory it runs in to have be owned by the running user (root in eng builds). Change-Id: I5230908291fd2ff6c5ebda98cfc3ef4c7ea7482e
Diffstat (limited to 'test/085-old-style-inner-class')
-rw-r--r--test/085-old-style-inner-class/build5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/085-old-style-inner-class/build b/test/085-old-style-inner-class/build
index 02190f2..299fc02 100644
--- a/test/085-old-style-inner-class/build
+++ b/test/085-old-style-inner-class/build
@@ -25,5 +25,6 @@ ${JAVAC} -source 1.4 -target 1.4 -d classes `find src -name '*.java'`
# Suppress stderr to keep the inner class warnings out of the expected output.
dx --debug --dex --dump-to=classes.lst --output=classes.dex --dump-width=1000 classes 2>/dev/null
-zip ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar classes.dex
-dex2oatd --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar --dex-location=/data/art-test/$TEST_NAME.jar --oat-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar.oat 2>/dev/null
+mkdir -p ${ANDROID_PRODUCT_OUT}/data/run-test
+zip ${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME.jar classes.dex
+dex2oatd --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art --dex-file=${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME.jar --dex-location=/data/run-test/$TEST_NAME.jar --oat-file=${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME.jar.oat 2>/dev/null