diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-12-11 14:57:47 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2011-12-12 11:20:06 -0800 |
| commit | 6ef827a33b04fd5413d2ad88fd4599ca1920c824 (patch) | |
| tree | 77406068cca6949921ae61e07b8f933e107b5947 /test/etc/push-and-run-test-jar | |
| parent | 996a72b3b6149abbff1a5bddf2d6af6a77d3082f (diff) | |
| download | art-6ef827a33b04fd5413d2ad88fd4599ca1920c824.tar.gz art-6ef827a33b04fd5413d2ad88fd4599ca1920c824.tar.bz2 art-6ef827a33b04fd5413d2ad88fd4599ca1920c824.zip | |
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/etc/push-and-run-test-jar')
| -rwxr-xr-x | test/etc/push-and-run-test-jar | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/etc/push-and-run-test-jar b/test/etc/push-and-run-test-jar index 1d10e4d41d..99b8c12841 100755 --- a/test/etc/push-and-run-test-jar +++ b/test/etc/push-and-run-test-jar @@ -91,10 +91,14 @@ msg "------------------------------" if [ "$QUIET" = "n" ]; then adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar /system/framework + adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat /system/framework adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.jar /data/art-test + adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.oat /data/art-test else adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar /data/art-test >/dev/null 2>&1 + adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat /data/art-test >/dev/null 2>&1 adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.jar /data/art-test >/dev/null 2>&1 + adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.oat /data/art-test >/dev/null 2>&1 fi if [ "$DEBUG" = "y" ]; then |