diff options
| author | Jean-Marie Henaff <jmhenaff@google.com> | 2015-01-16 17:03:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-16 17:03:04 +0000 |
| commit | 6a308a652301b0ebbf575bc439af4e32d061957d (patch) | |
| tree | d25750c163df7d65c09e4d34726c7a9c846b3cd9 /sched | |
| parent | 0b2c26f6bc43556a083d17f6f483124ec7b6aed2 (diff) | |
| parent | 9b2726a5d4ad756c957efa33fee219c6445456ee (diff) | |
| download | toolchain_jack-6a308a652301b0ebbf575bc439af4e32d061957d.tar.gz toolchain_jack-6a308a652301b0ebbf575bc439af4e32d061957d.tar.bz2 toolchain_jack-6a308a652301b0ebbf575bc439af4e32d061957d.zip | |
Merge "Use Ant script to run schedlib tests" into ub-jack
Diffstat (limited to 'sched')
| -rw-r--r-- | sched/Android.mk | 5 | ||||
| -rwxr-xr-x | sched/run-sched-tests | 14 |
2 files changed, 4 insertions, 15 deletions
diff --git a/sched/Android.mk b/sched/Android.mk index 9c2c8e33..5d4437cd 100644 --- a/sched/Android.mk +++ b/sched/Android.mk @@ -81,8 +81,3 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ junit4-jack include $(BUILD_HOST_JAVA_LIBRARY) - -.PHONY: test-sched -test-sched: PRIVATE_RUN_TESTS := $(LOCAL_PATH)/run-sched-tests -test-sched: libschedtests $(LOCAL_PATH)/run-sched-tests - $(PRIVATE_RUN_TESTS) diff --git a/sched/run-sched-tests b/sched/run-sched-tests index f2d9a558..42fa77a4 100755 --- a/sched/run-sched-tests +++ b/sched/run-sched-tests @@ -16,15 +16,9 @@ CURRENT_DIR=$(dirname $0) -if [ -z "$ANDROID_BUILD_TOP" ] || [ "${ANDROID_BUILD_TOP}+testDefinedButNotSet" = "testDefinedButNotSet" ]; -then - echo "Error: environment not set. Please run source build/core/envsetup.sh." - exit -fi - -java -cp ${ANDROID_BUILD_TOP}/out/host/linux-x86/framework/junit4-jack.jar:\ -${ANDROID_BUILD_TOP}/out/host/common/obj/JAVA_LIBRARIES/libschedtests_intermediates/classes:\ -${ANDROID_BUILD_TOP}/out/host/common/obj/JAVA_LIBRARIES/schedlib_intermediates/classes:\ -${ANDROID_BUILD_TOP}/out/host/common/obj/JAVA_LIBRARIES/guava-jack_intermediates/classes \ +java -cp ${CURRENT_DIR}/libs/junit4.jar:\ +${CURRENT_DIR}/dist/schedtests-lib.jar:\ +${CURRENT_DIR}/dist/sched-lib.jar:\ +${CURRENT_DIR}/libs/guava-lib.jar \ org.junit.runner.JUnitCore \ com.android.sched.AllTests |