diff options
| author | Elliott Hughes <enh@google.com> | 2010-02-24 16:58:08 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2010-02-24 16:58:08 -0800 |
| commit | c6bb9d9fe7801ed33d633db05c3492f1cdddcdcf (patch) | |
| tree | bdae26959fe05ddaff1207581bebb45bd0a779cc | |
| parent | b6b05b164e41a1920bea27a2326860d2524ac570 (diff) | |
| download | libcore-c6bb9d9fe7801ed33d633db05c3492f1cdddcdcf.zip libcore-c6bb9d9fe7801ed33d633db05c3492f1cdddcdcf.tar.gz libcore-c6bb9d9fe7801ed33d633db05c3492f1cdddcdcf.tar.bz2 | |
If we're in an Android build tree, we should use core.jar as our "SDK".
This fixes running junit tests for non-public classes, since bdc's --sdk
change went in. While --sdk is perfect for real people, it's probably not
what we want to use ourselves. Since this script is already hard-coded
for use in an Android build tree, this seems like a reasonable place to
apply the fix.
| -rwxr-xr-x | tools/runner/vogar | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/runner/vogar b/tools/runner/vogar index e5a6ad0..cdd800a 100755 --- a/tools/runner/vogar +++ b/tools/runner/vogar @@ -17,5 +17,8 @@ # m core-tests junit caliper snod && adb reboot bootloader && fastboot flashall && adb wait-for-device # mmm dalvik/libcore/tools/runner -classpath=`dirname $0`/../../../../out/host/linux-x86/framework/dalvik_runner.jar -exec java -cp $classpath dalvik.runner.DalvikRunner "$@" +android_root=`dirname $0`/../../../.. + +classpath=${android_root}/out/host/linux-x86/framework/dalvik_runner.jar +core_jar=${android_root}/out/target/common/obj/JAVA_LIBRARIES/core_intermediates/classes.jar +exec java -cp $classpath dalvik.runner.DalvikRunner --sdk ${core_jar} "$@" |