diff options
| author | Brian Carlstrom <bdc@google.com> | 2012-03-10 23:43:07 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2012-03-10 23:43:10 -0800 |
| commit | 904667a58fa38437d1be6907beb3fb76d1982e0b (patch) | |
| tree | 4bddc18023c6d53509464af2914232963b48dd82 /test/etc/push-and-run-test-jar | |
| parent | 5cb71bb4437db51f415e57e6002ba1ef023e7de1 (diff) | |
| download | art-904667a58fa38437d1be6907beb3fb76d1982e0b.zip art-904667a58fa38437d1be6907beb3fb76d1982e0b.tar.gz art-904667a58fa38437d1be6907beb3fb76d1982e0b.tar.bz2 | |
Do not generate run-test out files in $ANDROID_PRODUCT_OUT
If run-test leaves cruft in $ANDROID_PRODUCT_OUT, flashall -w will
make the files on the device owned by the system user. This will cause
run-test 071-dexfile to fail when run as root.
Change-Id: I071a1d52cbbefd0e75556706b473260cb6832fd4
Diffstat (limited to 'test/etc/push-and-run-test-jar')
| -rwxr-xr-x | test/etc/push-and-run-test-jar | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/etc/push-and-run-test-jar b/test/etc/push-and-run-test-jar index 324ac2a..e38c0cf 100755 --- a/test/etc/push-and-run-test-jar +++ b/test/etc/push-and-run-test-jar @@ -92,16 +92,16 @@ msg "------------------------------" if [ "$QUIET" = "n" ]; then adb shell mkdir /data/run-test - adb push ${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME.jar /data/run-test - adb push ${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME.jar.oat /data/run-test - adb push ${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME-ex.jar /data/run-test - adb push ${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME-ex.jar.oat /data/run-test + adb push $TEST_NAME.jar /data/run-test + adb push $TEST_NAME.jar.oat /data/run-test + adb push $TEST_NAME-ex.jar /data/run-test + adb push $TEST_NAME-ex.jar.oat /data/run-test else adb shell mkdir /data/run-test >/dev/null 2>&1 - adb push ${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME.jar /data/run-test >/dev/null 2>&1 - adb push ${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME.jar.oat /data/run-test >/dev/null 2>&1 - adb push ${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME-ex.jar /data/run-test >/dev/null 2>&1 - adb push ${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME-ex.jar.oat /data/run-test >/dev/null 2>&1 + adb push $TEST_NAME.jar /data/run-test >/dev/null 2>&1 + adb push $TEST_NAME.jar.oat /data/run-test >/dev/null 2>&1 + adb push $TEST_NAME-ex.jar /data/run-test >/dev/null 2>&1 + adb push $TEST_NAME-ex.jar.oat /data/run-test >/dev/null 2>&1 fi if [ "$DEBUG" = "y" ]; then |