diff options
| -rwxr-xr-x | tools/run-jdwp-tests.sh | 15 | ||||
| -rwxr-xr-x | tools/run-libcore-tests.sh | 16 |
2 files changed, 28 insertions, 3 deletions
diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh index b6a19b7b5c..3e5a1c0959 100755 --- a/tools/run-jdwp-tests.sh +++ b/tools/run-jdwp-tests.sh @@ -44,6 +44,8 @@ vm_args="" # By default, we run the whole JDWP test suite. test="org.apache.harmony.jpda.tests.share.AllTests" host="no" +# Use JIT compiling by default. +use_jit=true while true; do if [[ "$1" == "--mode=host" ]]; then @@ -62,6 +64,11 @@ while true; do elif [[ $1 == -Ximage:* ]]; then image="$1" shift + elif [[ "$1" == "--no-jit" ]]; then + use_jit=false + # Remove the --no-jit from the arguments. + args=${args/$1} + shift elif [[ $1 == "--debug" ]]; then debug="yes" # Remove the --debug from the arguments. @@ -90,8 +97,12 @@ done if [[ "$image" != "" ]]; then vm_args="--vm-arg $image" fi -vm_args="$vm_args --vm-arg -Xusejit:true" -debuggee_args="$debuggee_args -Xusejit:true" +if $use_jit; then + vm_args="$vm_args --vm-arg -Xcompiler-option --vm-arg --compiler-filter=interpret-only" + debuggee_args="$debuggee_args -Xcompiler-option --compiler-filter=interpret-only" +fi +vm_args="$vm_args --vm-arg -Xusejit:$use_jit" +debuggee_args="$debuggee_args -Xusejit:$use_jit" if [[ $debug == "yes" ]]; then art="$art -d" art_debugee="$art_debugee -d" diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh index 00bb3c5ff0..d9905f3f55 100755 --- a/tools/run-libcore-tests.sh +++ b/tools/run-libcore-tests.sh @@ -43,6 +43,9 @@ if [ "$ANDROID_SERIAL" = "emulator-5554" ]; then emulator="yes" fi +# Use JIT compiling by default. +use_jit=true + # Packages that currently work correctly with the expectation files. working_packages=("dalvik.system" "libcore.icu" @@ -91,6 +94,11 @@ while true; do # classpath/resources differences when compiling the boot image. vogar_args="$vogar_args --vm-arg -Ximage:/non/existent/vogar.art" shift + elif [[ "$1" == "--no-jit" ]]; then + # Remove the --no-jit from the arguments. + vogar_args=${vogar_args/$1} + use_jit=false + shift elif [[ "$1" == "--debug" ]]; then # Remove the --debug from the arguments. vogar_args=${vogar_args/$1} @@ -111,7 +119,13 @@ vogar_args="$vogar_args --timeout 480" # Use Jack with "1.8" configuration. vogar_args="$vogar_args --toolchain jack --language JN" +# JIT settings. +if $use_jit; then + vogar_args="$vogar_args --vm-arg -Xcompiler-option --vm-arg --compiler-filter=interpret-only" +fi +vogar_args="$vogar_args --vm-arg -Xusejit:$use_jit" + # Run the tests using vogar. echo "Running tests for the following test packages:" echo ${working_packages[@]} | tr " " "\n" -vogar $vogar_args --vm-arg -Xusejit:true $expectations --classpath $jsr166_test_jack --classpath $test_jack ${working_packages[@]} +vogar $vogar_args $expectations --classpath $jsr166_test_jack --classpath $test_jack ${working_packages[@]} |