diff options
| author | 2017-06-12 15:30:40 +0000 | |
|---|---|---|
| committer | 2017-06-12 15:30:42 +0000 | |
| commit | 50804941fdedb35b0de2301c10ca6d23c77c3f3d (patch) | |
| tree | 5c497b3a5cc61558ff57ab6ef089cf20b6eb3e44 | |
| parent | 6cc4bf3176f8dbc597fea2fe25f69c845d895eb9 (diff) | |
| parent | e2377646af151d933bef17334193eeb49bfaa077 (diff) | |
Merge "Disable checker when testing no-prebuilds" into oc-dev
| -rw-r--r-- | test/knownfailures.json | 6 | ||||
| -rwxr-xr-x | test/run-test | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/test/knownfailures.json b/test/knownfailures.json index e0dcac4fb3..225aad60fb 100644 --- a/test/knownfailures.json +++ b/test/knownfailures.json @@ -608,5 +608,11 @@ "Tests that have verify-at-runtime classes, but being compiled when using vdex." ], "variant": "speed-profile" + }, + { + "tests": ["137-cfi", "629-vdex-speed"], + "description": [ "Tests require speed compilation which is no longer the default for", + "no-prebuild configs."], + "variant": "no-prebuild" } ] diff --git a/test/run-test b/test/run-test index f60f766751..a54c603172 100755 --- a/test/run-test +++ b/test/run-test @@ -728,10 +728,8 @@ export TEST_NAME=`basename ${test_dir}` # Checker when compiled with Optimizing on host. if [[ "$TEST_NAME" =~ ^[0-9]+-checker- ]]; then if [ "$runtime" = "art" -a "$image_suffix" = "" -a "$USE_JACK" = "true" ]; then - # In no-prebuild mode, the compiler is only invoked if both dex2oat and - # patchoat are available. Disable Checker otherwise (b/22552692). - if [ "$prebuild_mode" = "yes" ] \ - || [ "$have_patchoat" = "yes" -a "$have_dex2oat" = "yes" ]; then + # In no-prebuild mode, the compiler only quickens so disable the checker. + if [ "$prebuild_mode" = "yes" ]; then run_checker="yes" if [ "$target_mode" = "no" ]; then |