diff options
Diffstat (limited to 'test/run-test')
| -rwxr-xr-x | test/run-test | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/test/run-test b/test/run-test index d0f93b9231..01464cd6b6 100755 --- a/test/run-test +++ b/test/run-test @@ -45,7 +45,7 @@ export JAVAC="javac -g -source 1.7 -target 1.7 -Xlint:-options" export RUN="${progdir}/etc/run-test-jar" export DEX_LOCATION=/data/run-test/${test_dir} export NEED_DEX="true" -export USE_JACK="false" +export USE_JACK="true" export SMALI_ARGS="--experimental --api-level 23" # If dx was not set by the environment variable, assume it is in the path. @@ -73,11 +73,6 @@ if [ -z "$JACK" ]; then export JACK="jack" fi -# If the tree is compiled with Jack, build test with Jack by default. -if [ "$ANDROID_COMPILE_WITH_JACK" = "true" ]; then - USE_JACK="true" -fi - # ANDROID_BUILD_TOP is not set in a build environment. if [ -z "$ANDROID_BUILD_TOP" ]; then export ANDROID_BUILD_TOP=$oldwd @@ -246,25 +241,22 @@ while true; do run_args="${run_args} --zygote" shift elif [ "x$1" = "x--interpreter" ]; then - run_args="${run_args} --interpreter" + run_args="${run_args} --interpreter --runtime-option -XOatFileManagerCompilerFilter:verify-at-runtime" image_suffix="-interpreter" shift elif [ "x$1" = "x--jit" ]; then - run_args="${run_args} --jit" + run_args="${run_args} --jit --runtime-option -XOatFileManagerCompilerFilter:verify-at-runtime" image_suffix="-jit" shift elif [ "x$1" = "x--optimizing" ]; then run_args="${run_args} -Xcompiler-option --compiler-backend=Optimizing" image_suffix="-optimizing" shift - elif [ "x$1" = "x--quick" ]; then - run_args="${run_args} -Xcompiler-option --compiler-backend=Quick" - shift elif [ "x$1" = "x--no-verify" ]; then - run_args="${run_args} --no-verify" + run_args="${run_args} --no-verify --runtime-option -XOatFileManagerCompilerFilter:verify-none" shift elif [ "x$1" = "x--verify-soft-fail" ]; then - run_args="${run_args} --verify-soft-fail" + run_args="${run_args} --verify-soft-fail --runtime-option -XOatFileManagerCompilerFilter:verify-at-runtime" image_suffix="-interp-ac" shift elif [ "x$1" = "x--no-optimize" ]; then @@ -394,7 +386,7 @@ if [ "$gc_verify" = "true" ]; then run_args="${run_args} --runtime-option -Xgc:preverify_rosalloc --runtime-option -Xgc:postverify_rosalloc" fi if [ "$gc_stress" = "true" ]; then - run_args="${run_args} --runtime-option -Xgc:SS,gcstress --runtime-option -Xms2m --runtime-option -Xmx16m" + run_args="${run_args} --gc-stress --runtime-option -Xgc:SS,gcstress --runtime-option -Xms2m --runtime-option -Xmx16m" fi if [ "$trace" = "true" ]; then run_args="${run_args} --runtime-option -Xmethod-trace --runtime-option -Xmethod-trace-file-size:2000000" @@ -565,7 +557,6 @@ if [ "$usage" = "yes" ]; then echo " --interpreter Enable interpreter only mode (off by default)." echo " --jit Enable jit (off by default)." echo " --optimizing Enable optimizing compiler (default)." - echo " --quick Use Quick compiler (off by default)." echo " --no-verify Turn off verification (on by default)." echo " --verify-soft-fail Force soft fail verification (off by default)." echo " Verification is enabled if neither --no-verify" |