summaryrefslogtreecommitdiffstats
path: root/test/085-old-style-inner-class
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2011-12-11 14:57:47 -0800
committerBrian Carlstrom <bdc@google.com>2011-12-12 11:20:06 -0800
commit6ef827a33b04fd5413d2ad88fd4599ca1920c824 (patch)
tree77406068cca6949921ae61e07b8f933e107b5947 /test/085-old-style-inner-class
parent996a72b3b6149abbff1a5bddf2d6af6a77d3082f (diff)
downloadart-6ef827a33b04fd5413d2ad88fd4599ca1920c824.zip
art-6ef827a33b04fd5413d2ad88fd4599ca1920c824.tar.gz
art-6ef827a33b04fd5413d2ad88fd4599ca1920c824.tar.bz2
Revert dex2oat file locking
Effectively "git revert 234da578a2d91ed7f2ef47b2ec23fb0033e2746b" Changed run-test to do dex2oat on the host to eliminate original motivation for dex2oat locking Change-Id: I58d64f9b2ad7cf137df865945dd31361ca57f675
Diffstat (limited to 'test/085-old-style-inner-class')
-rw-r--r--test/085-old-style-inner-class/build4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/085-old-style-inner-class/build b/test/085-old-style-inner-class/build
index b7e12ae..acd6316 100644
--- a/test/085-old-style-inner-class/build
+++ b/test/085-old-style-inner-class/build
@@ -23,7 +23,7 @@ mkdir classes
${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
+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
+dex2oat --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar --oat=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat 2>/dev/null