diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/118-noimage-dex2oat/run | 1 | ||||
| -rwxr-xr-x | test/run-test | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/test/118-noimage-dex2oat/run b/test/118-noimage-dex2oat/run index 4b1d0cea59..07bdb08785 100644 --- a/test/118-noimage-dex2oat/run +++ b/test/118-noimage-dex2oat/run @@ -41,7 +41,6 @@ fi bpath="${framework}/core-libart${bpath_suffix}.jar" bpath="${bpath}:${framework}/conscrypt${bpath_suffix}.jar" bpath="${bpath}:${framework}/okhttp${bpath_suffix}.jar" -bpath="${bpath}:${framework}/core-junit${bpath_suffix}.jar" bpath="${bpath}:${framework}/bouncycastle${bpath_suffix}.jar" bpath_arg="--runtime-option -Xbootclasspath:${bpath}" diff --git a/test/run-test b/test/run-test index d07668726b..ec34e0946a 100755 --- a/test/run-test +++ b/test/run-test @@ -462,7 +462,7 @@ fi if [ "$runtime" = "dalvik" ]; then if [ "$target_mode" = "no" ]; then framework="${ANDROID_PRODUCT_OUT}/system/framework" - bpath="${framework}/core-libart.jar:${framework}/core-oj.jar:${framework}/conscrypt.jar:${framework}/okhttp.jar:${framework}/core-junit.jar:${framework}/bouncycastle.jar:${framework}/ext.jar" + bpath="${framework}/core-libart.jar:${framework}/core-oj.jar:${framework}/conscrypt.jar:${framework}/okhttp.jar:${framework}/bouncycastle.jar:${framework}/ext.jar" run_args="${run_args} --boot -Xbootclasspath:${bpath}" else true # defaults to using target BOOTCLASSPATH @@ -509,7 +509,6 @@ if [ "$have_image" = "no" ]; then bpath="${bpath}:${framework}/core-oj${bpath_suffix}.jar" bpath="${bpath}:${framework}/conscrypt${bpath_suffix}.jar" bpath="${bpath}:${framework}/okhttp${bpath_suffix}.jar" - bpath="${bpath}:${framework}/core-junit${bpath_suffix}.jar" bpath="${bpath}:${framework}/bouncycastle${bpath_suffix}.jar" # Pass down the bootclasspath run_args="${run_args} --runtime-option -Xbootclasspath:${bpath}" |