diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/117-nopatchoat/nopatchoat.cc | 3 | ||||
| -rwxr-xr-x | test/run-test | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/test/117-nopatchoat/nopatchoat.cc b/test/117-nopatchoat/nopatchoat.cc index 82e1fc8ae5a..0dab4007a70 100644 --- a/test/117-nopatchoat/nopatchoat.cc +++ b/test/117-nopatchoat/nopatchoat.cc @@ -54,7 +54,8 @@ class NoPatchoatTest { } const OatFile* oat_file = oat_dex_file->GetOatFile(); - return !oat_file->IsPic() && !oat_file->IsExtractOnly(); + return !oat_file->IsPic() + && CompilerFilter::IsCompilationEnabled(oat_file->GetCompilerFilter()); } }; diff --git a/test/run-test b/test/run-test index 55989c6ed61..01464cd6b6b 100755 --- a/test/run-test +++ b/test/run-test @@ -241,11 +241,11 @@ 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 @@ -253,10 +253,10 @@ while true; do image_suffix="-optimizing" 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 |