Disable checker when testing no-prebuilds
By default, the compiler will only quicken (in no prebuild
mode) and will not generate a cfg file.
The checker test are already covered by other modes like:
art-preopt (pic) or art-optimizing (npic).
Also, disable 137-cfi and 629-vdex-speed which require
speed compilation.
Test: testrunner.py --host --no-prebuild
Bug: 38442248
(cherry picked from commit 6c78b37e521f207fb25e6eac0542bea37a6239b5)
(cherry picked from commit 07c6d726c9acfa06252039412e9985706747648a)
Change-Id: I82c1a7bb390007566fbb5fb1e69141b80a991f6d
diff --git a/test/knownfailures.json b/test/knownfailures.json
index e0dcac4..225aad6 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 f60f766..a54c603 100755
--- a/test/run-test
+++ b/test/run-test
@@ -728,10 +728,8 @@
# 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
