diff options
| author | 2016-07-22 22:32:08 +0000 | |
|---|---|---|
| committer | 2016-07-22 22:32:08 +0000 | |
| commit | 115c1de1f812d380449ef89cfe50cc4fb4289275 (patch) | |
| tree | dc8d3c46beef9f83e728b59bb0f5c32337f13a9e | |
| parent | da2b8dc3ed319cdc22396d4ae420295515e4c9e3 (diff) | |
| parent | ebd089de04e2ca99dc9a149c48e6e7b7afe00438 (diff) | |
Merge "ART: Change run-*-tests to ANDROID_{HOST|PRODUCT}_OUT"
| -rwxr-xr-x | tools/run-jdwp-tests.sh | 6 | ||||
| -rwxr-xr-x | tools/run-libcore-tests.sh | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh index 976e1d8817..bdb2d4bd10 100755 --- a/tools/run-jdwp-tests.sh +++ b/tools/run-jdwp-tests.sh @@ -19,8 +19,12 @@ if [ ! -d libcore ]; then exit 1 fi +if [ -z "$ANDROID_HOST_OUT" ] ; then + ANDROID_HOST_OUT=${OUT_DIR-$ANDROID_BUILD_TOP/out}/host/linux-x86 +fi + # Jar containing all the tests. -test_jack=${OUT_DIR-out}/host/common/obj/JAVA_LIBRARIES/apache-harmony-jdwp-tests-hostdex_intermediates/classes.jack +test_jack=${ANDROID_HOST_OUT}/../common/obj/JAVA_LIBRARIES/apache-harmony-jdwp-tests-hostdex_intermediates/classes.jack if [ ! -f $test_jack ]; then echo "Before running, you must build jdwp tests and vogar:" \ diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh index 3e2a512355..3605aa0294 100755 --- a/tools/run-libcore-tests.sh +++ b/tools/run-libcore-tests.sh @@ -19,12 +19,17 @@ if [ ! -d libcore ]; then exit 1 fi +if [ -z "$ANDROID_PRODUCT_OUT" ] ; then + JAVA_LIBRARIES=out/target/common/obj/JAVA_LIBRARIES +else + JAVA_LIBRARIES=${ANDROID_PRODUCT_OUT}/../../common/obj/JAVA_LIBRARIES +fi + # Jar containing jsr166 tests. -jsr166_test_jack=${OUT_DIR-out}/target/common/obj/JAVA_LIBRARIES/jsr166-tests_intermediates/classes.jack +jsr166_test_jack=${JAVA_LIBRARIES}/jsr166-tests_intermediates/classes.jack # Jar containing all the other tests. -test_jack=${OUT_DIR-out}/target/common/obj/JAVA_LIBRARIES/core-tests_intermediates/classes.jack - +test_jack=${JAVA_LIBRARIES}/core-tests_intermediates/classes.jack if [ ! -f $test_jack ]; then echo "Before running, you must build core-tests, jsr166-tests and vogar: \ |