Regenerate ART test files to reinclude ART Checker tests.
This partly reverts commit 463255b4f1fcc8c34856a6b0780cf5ef238941c2.
Reason for revert: Checker support in test suites is complete.
Output of `art/test/utils/regen-test-files`:
$ art/test/utils/regen-test-files
Generated Blueprint files for 621 ART run-tests out of 919 (67%).
Generated TEST_MAPPING entries for 379 ART run-tests out of 919 (41%):
18 tests (5%) in `mainline-presubmit` test group.
189 tests (50%) in `presubmit` test group.
190 tests (50%) in `postsubmit` test group.
Test: atest --test-mapping art:all
Test: m mts && mts-tradefed run commandAndExit mts-art
Bug: 169852871
Bug: 162408889
Change-Id: Ic081869d6629776c0d70e8ceb3c2e9f0d3bf0caa
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 6935bb4..36bf4c2 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -14,6 +14,9 @@
"name": "art-run-test-004-InterfaceTest[com.google.android.art.apex]"
},
{
+ "name": "art-run-test-004-checker-UnsafeTest18[com.google.android.art.apex]"
+ },
+ {
"name": "art-run-test-006-args[com.google.android.art.apex]"
},
{
@@ -36,6 +39,21 @@
},
{
"name": "art-run-test-014-math3[com.google.android.art.apex]"
+ },
+ {
+ "name": "art-run-test-015-switch[com.google.android.art.apex]"
+ },
+ {
+ "name": "art-run-test-016-intern[com.google.android.art.apex]"
+ },
+ {
+ "name": "art-run-test-017-float[com.google.android.art.apex]"
+ },
+ {
+ "name": "art-run-test-018-stack-overflow[com.google.android.art.apex]"
+ },
+ {
+ "name": "art-run-test-019-wrong-array-type[com.google.android.art.apex]"
}
],
"presubmit": [
@@ -64,6 +82,9 @@
"name": "art-run-test-004-InterfaceTest"
},
{
+ "name": "art-run-test-004-checker-UnsafeTest18"
+ },
+ {
"name": "art-run-test-006-args"
},
{
@@ -262,6 +283,9 @@
"name": "art-run-test-100-reflect2"
},
{
+ "name": "art-run-test-1004-checker-volatile-ref-load"
+ },
+ {
"name": "art-run-test-101-fibonacci"
},
{
@@ -376,6 +400,12 @@
"name": "art-run-test-176-app-image-string"
},
{
+ "name": "art-run-test-1960-checker-bounds-codegen"
+ },
+ {
+ "name": "art-run-test-1961-checker-loop-vectorizer"
+ },
+ {
"name": "art-run-test-201-built-in-except-detail-messages"
},
{
@@ -418,6 +448,9 @@
"name": "art-run-test-2030-long-running-child"
},
{
+ "name": "art-run-test-2231-checker-heap-poisoning"
+ },
+ {
"name": "art-run-test-2232-write-metrics-to-log"
},
{
@@ -434,9 +467,7 @@
},
{
"name": "art-run-test-401-optimizing-compiler"
- }
- ],
- "postsubmit": [
+ },
{
"name": "art-run-test-402-optimizing-control-flow"
},
@@ -465,6 +496,12 @@
"name": "art-run-test-410-floats"
},
{
+ "name": "art-run-test-411-checker-hdiv-hrem-pow2"
+ },
+ {
+ "name": "art-run-test-411-checker-instruct-simplifier-hrem"
+ },
+ {
"name": "art-run-test-411-optimizing-arith"
},
{
@@ -546,21 +583,51 @@
"name": "art-run-test-440-stmp"
},
{
+ "name": "art-run-test-441-checker-inliner"
+ },
+ {
"name": "art-run-test-443-not-bool-inline"
},
{
+ "name": "art-run-test-444-checker-nce"
+ },
+ {
+ "name": "art-run-test-445-checker-licm"
+ },
+ {
+ "name": "art-run-test-446-checker-inliner2"
+ },
+ {
+ "name": "art-run-test-447-checker-inliner3"
+ },
+ {
+ "name": "art-run-test-449-checker-bce-rem"
+ },
+ {
+ "name": "art-run-test-450-checker-types"
+ },
+ {
"name": "art-run-test-451-regression-add-float"
},
{
"name": "art-run-test-451-spill-splot"
},
{
+ "name": "art-run-test-455-checker-gvn"
+ },
+ {
"name": "art-run-test-456-baseline-array-set"
},
{
"name": "art-run-test-458-long-to-fpu"
},
{
+ "name": "art-run-test-464-checker-inline-sharpen-calls"
+ },
+ {
+ "name": "art-run-test-465-checker-clinit-gvn"
+ },
+ {
"name": "art-run-test-469-condition-materialization"
},
{
@@ -568,41 +635,94 @@
},
{
"name": "art-run-test-471-deopt-environment"
- },
+ }
+ ],
+ "postsubmit": [
{
"name": "art-run-test-472-type-propagation"
},
{
+ "name": "art-run-test-473-checker-inliner-constants"
+ },
+ {
"name": "art-run-test-473-remove-dead-block"
},
{
+ "name": "art-run-test-474-checker-boolean-input"
+ },
+ {
"name": "art-run-test-474-fp-sub-neg"
},
{
"name": "art-run-test-475-simplify-mul-zero"
},
{
+ "name": "art-run-test-476-checker-ctor-memory-barrier"
+ },
+ {
"name": "art-run-test-476-clinit-inline-static-invoke"
},
{
+ "name": "art-run-test-477-checker-bound-type"
+ },
+ {
"name": "art-run-test-477-long-2-float-convers-precision"
},
{
+ "name": "art-run-test-478-checker-inline-noreturn"
+ },
+ {
+ "name": "art-run-test-478-checker-inliner-nested-loop"
+ },
+ {
"name": "art-run-test-479-regression-implicit-null-check"
},
{
+ "name": "art-run-test-480-checker-dead-blocks"
+ },
+ {
"name": "art-run-test-481-regression-phi-cond"
},
{
"name": "art-run-test-483-dce-block"
},
{
+ "name": "art-run-test-485-checker-dce-switch"
+ },
+ {
+ "name": "art-run-test-486-checker-must-do-null-check"
+ },
+ {
+ "name": "art-run-test-487-checker-inline-calls"
+ },
+ {
+ "name": "art-run-test-488-checker-inline-recursive-calls"
+ },
+ {
"name": "art-run-test-489-current-method-regression"
},
{
+ "name": "art-run-test-490-checker-inline"
+ },
+ {
"name": "art-run-test-491-current-method"
},
{
+ "name": "art-run-test-492-checker-inline-invoke-interface"
+ },
+ {
+ "name": "art-run-test-493-checker-inline-invoke-interface"
+ },
+ {
+ "name": "art-run-test-494-checker-instanceof-tests"
+ },
+ {
+ "name": "art-run-test-495-checker-checkcast-tests"
+ },
+ {
+ "name": "art-run-test-496-checker-inlining-class-loader"
+ },
+ {
"name": "art-run-test-499-bce-phi-array-length"
},
{
@@ -618,6 +738,9 @@
"name": "art-run-test-507-referrer"
},
{
+ "name": "art-run-test-508-checker-disassembly"
+ },
+ {
"name": "art-run-test-508-referrer-method"
},
{
@@ -630,27 +753,87 @@
"name": "art-run-test-519-bound-load-class"
},
{
+ "name": "art-run-test-521-checker-array-set-null"
+ },
+ {
"name": "art-run-test-521-regression-integer-field-set"
},
{
"name": "art-run-test-524-boolean-simplifier-regression"
},
{
+ "name": "art-run-test-525-checker-arrays-fields1"
+ },
+ {
+ "name": "art-run-test-525-checker-arrays-fields2"
+ },
+ {
"name": "art-run-test-526-long-regalloc"
},
{
+ "name": "art-run-test-527-checker-array-access-simd"
+ },
+ {
+ "name": "art-run-test-527-checker-array-access-split"
+ },
+ {
"name": "art-run-test-528-long-hint"
},
{
"name": "art-run-test-529-long-split"
},
{
+ "name": "art-run-test-530-checker-loops1"
+ },
+ {
+ "name": "art-run-test-530-checker-loops2"
+ },
+ {
+ "name": "art-run-test-530-checker-loops3"
+ },
+ {
+ "name": "art-run-test-530-checker-loops4"
+ },
+ {
+ "name": "art-run-test-530-checker-loops5"
+ },
+ {
+ "name": "art-run-test-530-checker-lse-ctor-fences"
+ },
+ {
+ "name": "art-run-test-530-checker-lse-simd"
+ },
+ {
+ "name": "art-run-test-530-checker-lse2"
+ },
+ {
"name": "art-run-test-530-instanceof-checkcast"
},
{
+ "name": "art-run-test-532-checker-nonnull-arrayset"
+ },
+ {
+ "name": "art-run-test-534-checker-bce-deoptimization"
+ },
+ {
"name": "art-run-test-535-deopt-and-inlining"
},
{
+ "name": "art-run-test-536-checker-intrinsic-optimization"
+ },
+ {
+ "name": "art-run-test-537-checker-arraycopy"
+ },
+ {
+ "name": "art-run-test-537-checker-jump-over-jump"
+ },
+ {
+ "name": "art-run-test-538-checker-embed-constants"
+ },
+ {
+ "name": "art-run-test-540-checker-rtp-bug"
+ },
+ {
"name": "art-run-test-542-bitfield-rotates"
},
{
@@ -663,18 +846,42 @@
"name": "art-run-test-545-tracing-and-jit"
},
{
+ "name": "art-run-test-548-checker-inlining-and-dce"
+ },
+ {
+ "name": "art-run-test-549-checker-types-merge"
+ },
+ {
+ "name": "art-run-test-550-checker-multiply-accumulate"
+ },
+ {
"name": "art-run-test-550-new-instance-clinit"
},
{
+ "name": "art-run-test-551-checker-clinit"
+ },
+ {
"name": "art-run-test-551-implicit-null-checks"
},
{
+ "name": "art-run-test-552-checker-x86-avx2-bit-manipulation"
+ },
+ {
+ "name": "art-run-test-554-checker-rtp-checkcast"
+ },
+ {
+ "name": "art-run-test-557-checker-instruct-simplifier-ror"
+ },
+ {
"name": "art-run-test-558-switch"
},
{
"name": "art-run-test-559-bce-ssa"
},
{
+ "name": "art-run-test-559-checker-rtp-ifnotnull"
+ },
+ {
"name": "art-run-test-560-packed-switch"
},
{
@@ -687,9 +894,45 @@
"name": "art-run-test-562-bce-preheader"
},
{
+ "name": "art-run-test-563-checker-invoke-super"
+ },
+ {
+ "name": "art-run-test-564-checker-bitcount"
+ },
+ {
+ "name": "art-run-test-564-checker-inline-loop"
+ },
+ {
+ "name": "art-run-test-564-checker-negbitwise"
+ },
+ {
+ "name": "art-run-test-565-checker-condition-liveness"
+ },
+ {
+ "name": "art-run-test-566-checker-codegen-select"
+ },
+ {
+ "name": "art-run-test-567-checker-builder-intrinsics"
+ },
+ {
+ "name": "art-run-test-568-checker-onebit"
+ },
+ {
+ "name": "art-run-test-570-checker-select"
+ },
+ {
+ "name": "art-run-test-572-checker-array-get-regression"
+ },
+ {
+ "name": "art-run-test-573-checker-checkcast-regression"
+ },
+ {
"name": "art-run-test-576-polymorphic-inlining"
},
{
+ "name": "art-run-test-577-checker-fp2int"
+ },
+ {
"name": "art-run-test-578-bce-visit"
},
{
@@ -699,57 +942,192 @@
"name": "art-run-test-579-inline-infinite"
},
{
+ "name": "art-run-test-580-checker-round"
+ },
+ {
"name": "art-run-test-580-crc32"
},
{
"name": "art-run-test-581-rtp"
},
{
+ "name": "art-run-test-582-checker-bce-length"
+ },
+ {
+ "name": "art-run-test-583-checker-zero"
+ },
+ {
+ "name": "art-run-test-584-checker-div-bool"
+ },
+ {
"name": "art-run-test-589-super-imt"
},
{
+ "name": "art-run-test-590-checker-arr-set-null-regression"
+ },
+ {
+ "name": "art-run-test-591-checker-regression-dead-loop"
+ },
+ {
+ "name": "art-run-test-593-checker-long-2-float-regression"
+ },
+ {
+ "name": "art-run-test-594-checker-array-alias"
+ },
+ {
"name": "art-run-test-594-load-string-regression"
},
{
+ "name": "art-run-test-603-checker-instanceof"
+ },
+ {
"name": "art-run-test-605-new-string-from-bytes"
},
{
"name": "art-run-test-607-daemon-stress"
},
{
+ "name": "art-run-test-609-checker-inline-interface"
+ },
+ {
+ "name": "art-run-test-609-checker-x86-bounds-check"
+ },
+ {
"name": "art-run-test-610-arraycopy"
},
{
+ "name": "art-run-test-611-checker-simplify-if"
+ },
+ {
+ "name": "art-run-test-614-checker-dump-constant-location"
+ },
+ {
+ "name": "art-run-test-615-checker-arm64-store-zero"
+ },
+ {
"name": "art-run-test-617-clinit-oome"
},
{
+ "name": "art-run-test-618-checker-induction"
+ },
+ {
+ "name": "art-run-test-619-checker-current-method"
+ },
+ {
+ "name": "art-run-test-620-checker-bce-intrinsics"
+ },
+ {
+ "name": "art-run-test-622-checker-bce-regressions"
+ },
+ {
+ "name": "art-run-test-625-checker-licm-regressions"
+ },
+ {
+ "name": "art-run-test-627-checker-unroll"
+ },
+ {
"name": "art-run-test-628-vdex"
},
{
+ "name": "art-run-test-631-checker-get-class"
+ },
+ {
+ "name": "art-run-test-632-checker-char-at-bounds"
+ },
+ {
+ "name": "art-run-test-635-checker-arm64-volatile-load-cc"
+ },
+ {
"name": "art-run-test-636-arm64-veneer-pool"
},
{
+ "name": "art-run-test-637-checker-throw-inline"
+ },
+ {
+ "name": "art-run-test-640-checker-boolean-simd"
+ },
+ {
+ "name": "art-run-test-640-checker-integer-valueof"
+ },
+ {
+ "name": "art-run-test-640-checker-simd"
+ },
+ {
+ "name": "art-run-test-641-checker-arraycopy"
+ },
+ {
"name": "art-run-test-641-iterations"
},
{
+ "name": "art-run-test-643-checker-bogus-ic"
+ },
+ {
+ "name": "art-run-test-645-checker-abs-simd"
+ },
+ {
+ "name": "art-run-test-646-checker-arraycopy-large-cst-pos"
+ },
+ {
+ "name": "art-run-test-646-checker-long-const-to-int"
+ },
+ {
+ "name": "art-run-test-646-checker-simd-hadd"
+ },
+ {
+ "name": "art-run-test-650-checker-inline-access-thunks"
+ },
+ {
+ "name": "art-run-test-654-checker-periodic"
+ },
+ {
+ "name": "art-run-test-655-checker-simd-arm-opt"
+ },
+ {
+ "name": "art-run-test-656-checker-simd-opt"
+ },
+ {
"name": "art-run-test-657-branches"
},
{
"name": "art-run-test-658-fp-read-barrier"
},
{
+ "name": "art-run-test-660-checker-sad"
+ },
+ {
+ "name": "art-run-test-660-checker-simd-sad"
+ },
+ {
+ "name": "art-run-test-661-checker-simd-reduc"
+ },
+ {
"name": "art-run-test-662-regression-alias"
},
{
+ "name": "art-run-test-665-checker-simd-zero"
+ },
+ {
"name": "art-run-test-666-dex-cache-itf"
},
{
+ "name": "art-run-test-667-checker-simd-alignment"
+ },
+ {
"name": "art-run-test-667-out-of-bounds"
},
{
+ "name": "art-run-test-669-checker-break"
+ },
+ {
"name": "art-run-test-671-npe-field-opts"
},
{
+ "name": "art-run-test-672-checker-throw-method"
+ },
+ {
+ "name": "art-run-test-673-checker-throw-vmethod"
+ },
+ {
"name": "art-run-test-674-HelloWorld-Dm"
},
{
@@ -762,6 +1140,9 @@
"name": "art-run-test-680-sink-regression"
},
{
+ "name": "art-run-test-684-checker-simd-dotprod"
+ },
+ {
"name": "art-run-test-684-select-condition"
},
{
@@ -777,6 +1158,9 @@
"name": "art-run-test-696-loop"
},
{
+ "name": "art-run-test-697-checker-string-append"
+ },
+ {
"name": "art-run-test-698-selects"
},
{
@@ -792,6 +1176,9 @@
"name": "art-run-test-705-register-conflict"
},
{
+ "name": "art-run-test-711-checker-type-conversion"
+ },
+ {
"name": "art-run-test-718-zipfile-finalizer"
},
{
diff --git a/test/004-checker-UnsafeTest18/Android.bp b/test/004-checker-UnsafeTest18/Android.bp
index 912b67b..d0601d1 100644
--- a/test/004-checker-UnsafeTest18/Android.bp
+++ b/test/004-checker-UnsafeTest18/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-004-checker-UnsafeTest18",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-004-checker-UnsafeTest18-expected-stdout",
diff --git a/test/1004-checker-volatile-ref-load/Android.bp b/test/1004-checker-volatile-ref-load/Android.bp
index d09e39d..4ac459d 100644
--- a/test/1004-checker-volatile-ref-load/Android.bp
+++ b/test/1004-checker-volatile-ref-load/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-1004-checker-volatile-ref-load",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-1004-checker-volatile-ref-load-expected-stdout",
diff --git a/test/1960-checker-bounds-codegen/Android.bp b/test/1960-checker-bounds-codegen/Android.bp
index 2f3f235..d71250f 100644
--- a/test/1960-checker-bounds-codegen/Android.bp
+++ b/test/1960-checker-bounds-codegen/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-1960-checker-bounds-codegen",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-1960-checker-bounds-codegen-expected-stdout",
diff --git a/test/1961-checker-loop-vectorizer/Android.bp b/test/1961-checker-loop-vectorizer/Android.bp
index bd5f809..8743f30 100644
--- a/test/1961-checker-loop-vectorizer/Android.bp
+++ b/test/1961-checker-loop-vectorizer/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-1961-checker-loop-vectorizer",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-1961-checker-loop-vectorizer-expected-stdout",
diff --git a/test/2231-checker-heap-poisoning/Android.bp b/test/2231-checker-heap-poisoning/Android.bp
index 07bad64..a1136fc 100644
--- a/test/2231-checker-heap-poisoning/Android.bp
+++ b/test/2231-checker-heap-poisoning/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-2231-checker-heap-poisoning",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-2231-checker-heap-poisoning-expected-stdout",
diff --git a/test/411-checker-hdiv-hrem-pow2/Android.bp b/test/411-checker-hdiv-hrem-pow2/Android.bp
index 1778b84..d65e92a 100644
--- a/test/411-checker-hdiv-hrem-pow2/Android.bp
+++ b/test/411-checker-hdiv-hrem-pow2/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-411-checker-hdiv-hrem-pow2",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-411-checker-hdiv-hrem-pow2-expected-stdout",
diff --git a/test/411-checker-instruct-simplifier-hrem/Android.bp b/test/411-checker-instruct-simplifier-hrem/Android.bp
index 95eb5cf..6cf10fb 100644
--- a/test/411-checker-instruct-simplifier-hrem/Android.bp
+++ b/test/411-checker-instruct-simplifier-hrem/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-411-checker-instruct-simplifier-hrem",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-411-checker-instruct-simplifier-hrem-expected-stdout",
diff --git a/test/441-checker-inliner/Android.bp b/test/441-checker-inliner/Android.bp
index 5fb8c81..05ff17c 100644
--- a/test/441-checker-inliner/Android.bp
+++ b/test/441-checker-inliner/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-441-checker-inliner",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-441-checker-inliner-expected-stdout",
diff --git a/test/444-checker-nce/Android.bp b/test/444-checker-nce/Android.bp
index a2dbf93..f2f28ee 100644
--- a/test/444-checker-nce/Android.bp
+++ b/test/444-checker-nce/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-444-checker-nce",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-444-checker-nce-expected-stdout",
diff --git a/test/445-checker-licm/Android.bp b/test/445-checker-licm/Android.bp
index d57fd0c..a77c884 100644
--- a/test/445-checker-licm/Android.bp
+++ b/test/445-checker-licm/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-445-checker-licm",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-445-checker-licm-expected-stdout",
diff --git a/test/446-checker-inliner2/Android.bp b/test/446-checker-inliner2/Android.bp
index 78f9921..0cd096e 100644
--- a/test/446-checker-inliner2/Android.bp
+++ b/test/446-checker-inliner2/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-446-checker-inliner2",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-446-checker-inliner2-expected-stdout",
diff --git a/test/447-checker-inliner3/Android.bp b/test/447-checker-inliner3/Android.bp
index a8d40fe..92d6498 100644
--- a/test/447-checker-inliner3/Android.bp
+++ b/test/447-checker-inliner3/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-447-checker-inliner3",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-447-checker-inliner3-expected-stdout",
diff --git a/test/449-checker-bce-rem/Android.bp b/test/449-checker-bce-rem/Android.bp
index 3c4e142..2d91b2a 100644
--- a/test/449-checker-bce-rem/Android.bp
+++ b/test/449-checker-bce-rem/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-449-checker-bce-rem",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-449-checker-bce-rem-expected-stdout",
diff --git a/test/450-checker-types/Android.bp b/test/450-checker-types/Android.bp
index 247f65f..d83543e 100644
--- a/test/450-checker-types/Android.bp
+++ b/test/450-checker-types/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-450-checker-types",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-450-checker-types-expected-stdout",
diff --git a/test/455-checker-gvn/Android.bp b/test/455-checker-gvn/Android.bp
index 0c0f2b6..b8b03da 100644
--- a/test/455-checker-gvn/Android.bp
+++ b/test/455-checker-gvn/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-455-checker-gvn",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-455-checker-gvn-expected-stdout",
diff --git a/test/464-checker-inline-sharpen-calls/Android.bp b/test/464-checker-inline-sharpen-calls/Android.bp
index 9f5ef28..332419f 100644
--- a/test/464-checker-inline-sharpen-calls/Android.bp
+++ b/test/464-checker-inline-sharpen-calls/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-464-checker-inline-sharpen-calls",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-464-checker-inline-sharpen-calls-expected-stdout",
diff --git a/test/465-checker-clinit-gvn/Android.bp b/test/465-checker-clinit-gvn/Android.bp
index 70a2d94..e6587f5 100644
--- a/test/465-checker-clinit-gvn/Android.bp
+++ b/test/465-checker-clinit-gvn/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-465-checker-clinit-gvn",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-465-checker-clinit-gvn-expected-stdout",
diff --git a/test/473-checker-inliner-constants/Android.bp b/test/473-checker-inliner-constants/Android.bp
index 338c41c..aac0a9f 100644
--- a/test/473-checker-inliner-constants/Android.bp
+++ b/test/473-checker-inliner-constants/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-473-checker-inliner-constants",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-473-checker-inliner-constants-expected-stdout",
diff --git a/test/474-checker-boolean-input/Android.bp b/test/474-checker-boolean-input/Android.bp
index 393b430..2365e17 100644
--- a/test/474-checker-boolean-input/Android.bp
+++ b/test/474-checker-boolean-input/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-474-checker-boolean-input",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-474-checker-boolean-input-expected-stdout",
diff --git a/test/476-checker-ctor-memory-barrier/Android.bp b/test/476-checker-ctor-memory-barrier/Android.bp
index 17976e5..46f6daf 100644
--- a/test/476-checker-ctor-memory-barrier/Android.bp
+++ b/test/476-checker-ctor-memory-barrier/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-476-checker-ctor-memory-barrier",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-476-checker-ctor-memory-barrier-expected-stdout",
diff --git a/test/477-checker-bound-type/Android.bp b/test/477-checker-bound-type/Android.bp
index 33bf946..d789590 100644
--- a/test/477-checker-bound-type/Android.bp
+++ b/test/477-checker-bound-type/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-477-checker-bound-type",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-477-checker-bound-type-expected-stdout",
diff --git a/test/478-checker-inline-noreturn/Android.bp b/test/478-checker-inline-noreturn/Android.bp
index a3addbb..1430bda 100644
--- a/test/478-checker-inline-noreturn/Android.bp
+++ b/test/478-checker-inline-noreturn/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-478-checker-inline-noreturn",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-478-checker-inline-noreturn-expected-stdout",
diff --git a/test/478-checker-inliner-nested-loop/Android.bp b/test/478-checker-inliner-nested-loop/Android.bp
index df03a4f..7874305 100644
--- a/test/478-checker-inliner-nested-loop/Android.bp
+++ b/test/478-checker-inliner-nested-loop/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-478-checker-inliner-nested-loop",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-478-checker-inliner-nested-loop-expected-stdout",
diff --git a/test/480-checker-dead-blocks/Android.bp b/test/480-checker-dead-blocks/Android.bp
index 6b2a519..7e7e75c 100644
--- a/test/480-checker-dead-blocks/Android.bp
+++ b/test/480-checker-dead-blocks/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-480-checker-dead-blocks",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-480-checker-dead-blocks-expected-stdout",
diff --git a/test/485-checker-dce-switch/Android.bp b/test/485-checker-dce-switch/Android.bp
index 150dc3b..0760eda 100644
--- a/test/485-checker-dce-switch/Android.bp
+++ b/test/485-checker-dce-switch/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-485-checker-dce-switch",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-485-checker-dce-switch-expected-stdout",
diff --git a/test/486-checker-must-do-null-check/Android.bp b/test/486-checker-must-do-null-check/Android.bp
index fa97447..4363dc1 100644
--- a/test/486-checker-must-do-null-check/Android.bp
+++ b/test/486-checker-must-do-null-check/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-486-checker-must-do-null-check",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-486-checker-must-do-null-check-expected-stdout",
diff --git a/test/487-checker-inline-calls/Android.bp b/test/487-checker-inline-calls/Android.bp
index 494137b..edbb0f3 100644
--- a/test/487-checker-inline-calls/Android.bp
+++ b/test/487-checker-inline-calls/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-487-checker-inline-calls",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-487-checker-inline-calls-expected-stdout",
diff --git a/test/488-checker-inline-recursive-calls/Android.bp b/test/488-checker-inline-recursive-calls/Android.bp
index 2db18f3..a3188f0 100644
--- a/test/488-checker-inline-recursive-calls/Android.bp
+++ b/test/488-checker-inline-recursive-calls/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-488-checker-inline-recursive-calls",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-488-checker-inline-recursive-calls-expected-stdout",
diff --git a/test/490-checker-inline/Android.bp b/test/490-checker-inline/Android.bp
index 46b3b90..588d23f 100644
--- a/test/490-checker-inline/Android.bp
+++ b/test/490-checker-inline/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-490-checker-inline",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-490-checker-inline-expected-stdout",
diff --git a/test/492-checker-inline-invoke-interface/Android.bp b/test/492-checker-inline-invoke-interface/Android.bp
index dc0797e..393f5d4 100644
--- a/test/492-checker-inline-invoke-interface/Android.bp
+++ b/test/492-checker-inline-invoke-interface/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-492-checker-inline-invoke-interface",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-492-checker-inline-invoke-interface-expected-stdout",
diff --git a/test/493-checker-inline-invoke-interface/Android.bp b/test/493-checker-inline-invoke-interface/Android.bp
index cd8b071..c1a0e0a 100644
--- a/test/493-checker-inline-invoke-interface/Android.bp
+++ b/test/493-checker-inline-invoke-interface/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-493-checker-inline-invoke-interface",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-493-checker-inline-invoke-interface-expected-stdout",
diff --git a/test/494-checker-instanceof-tests/Android.bp b/test/494-checker-instanceof-tests/Android.bp
index c8243af..11e9bc5 100644
--- a/test/494-checker-instanceof-tests/Android.bp
+++ b/test/494-checker-instanceof-tests/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-494-checker-instanceof-tests",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-494-checker-instanceof-tests-expected-stdout",
diff --git a/test/495-checker-checkcast-tests/Android.bp b/test/495-checker-checkcast-tests/Android.bp
index 59942ac..e1eb484 100644
--- a/test/495-checker-checkcast-tests/Android.bp
+++ b/test/495-checker-checkcast-tests/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-495-checker-checkcast-tests",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-495-checker-checkcast-tests-expected-stdout",
diff --git a/test/496-checker-inlining-class-loader/Android.bp b/test/496-checker-inlining-class-loader/Android.bp
index b5d227b..8dc06d9 100644
--- a/test/496-checker-inlining-class-loader/Android.bp
+++ b/test/496-checker-inlining-class-loader/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-496-checker-inlining-class-loader",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-496-checker-inlining-class-loader-expected-stdout",
diff --git a/test/508-checker-disassembly/Android.bp b/test/508-checker-disassembly/Android.bp
index aaefef5..43f966f 100644
--- a/test/508-checker-disassembly/Android.bp
+++ b/test/508-checker-disassembly/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-508-checker-disassembly",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-508-checker-disassembly-expected-stdout",
diff --git a/test/521-checker-array-set-null/Android.bp b/test/521-checker-array-set-null/Android.bp
index f27f87f..1359917 100644
--- a/test/521-checker-array-set-null/Android.bp
+++ b/test/521-checker-array-set-null/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-521-checker-array-set-null",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-521-checker-array-set-null-expected-stdout",
diff --git a/test/525-checker-arrays-fields1/Android.bp b/test/525-checker-arrays-fields1/Android.bp
index e7f72ca..b51a293 100644
--- a/test/525-checker-arrays-fields1/Android.bp
+++ b/test/525-checker-arrays-fields1/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-525-checker-arrays-fields1",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-525-checker-arrays-fields1-expected-stdout",
diff --git a/test/525-checker-arrays-fields2/Android.bp b/test/525-checker-arrays-fields2/Android.bp
index 4a7b32a..7b2cd3f 100644
--- a/test/525-checker-arrays-fields2/Android.bp
+++ b/test/525-checker-arrays-fields2/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-525-checker-arrays-fields2",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-525-checker-arrays-fields2-expected-stdout",
diff --git a/test/527-checker-array-access-simd/Android.bp b/test/527-checker-array-access-simd/Android.bp
index 9c4e84b..ed2935d 100644
--- a/test/527-checker-array-access-simd/Android.bp
+++ b/test/527-checker-array-access-simd/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-527-checker-array-access-simd",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-527-checker-array-access-simd-expected-stdout",
diff --git a/test/527-checker-array-access-split/Android.bp b/test/527-checker-array-access-split/Android.bp
index f2f6032..92fb51c 100644
--- a/test/527-checker-array-access-split/Android.bp
+++ b/test/527-checker-array-access-split/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-527-checker-array-access-split",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-527-checker-array-access-split-expected-stdout",
diff --git a/test/530-checker-loops1/Android.bp b/test/530-checker-loops1/Android.bp
index e8421a7..16a5889 100644
--- a/test/530-checker-loops1/Android.bp
+++ b/test/530-checker-loops1/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-530-checker-loops1",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-530-checker-loops1-expected-stdout",
diff --git a/test/530-checker-loops2/Android.bp b/test/530-checker-loops2/Android.bp
index 16aaa90..dab9eb9 100644
--- a/test/530-checker-loops2/Android.bp
+++ b/test/530-checker-loops2/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-530-checker-loops2",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-530-checker-loops2-expected-stdout",
diff --git a/test/530-checker-loops3/Android.bp b/test/530-checker-loops3/Android.bp
index 1574547..3381c54 100644
--- a/test/530-checker-loops3/Android.bp
+++ b/test/530-checker-loops3/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-530-checker-loops3",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-530-checker-loops3-expected-stdout",
diff --git a/test/530-checker-loops4/Android.bp b/test/530-checker-loops4/Android.bp
index 800c48b..ba86a4d 100644
--- a/test/530-checker-loops4/Android.bp
+++ b/test/530-checker-loops4/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-530-checker-loops4",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-530-checker-loops4-expected-stdout",
diff --git a/test/530-checker-loops5/Android.bp b/test/530-checker-loops5/Android.bp
index b029616..4f1cdf5 100644
--- a/test/530-checker-loops5/Android.bp
+++ b/test/530-checker-loops5/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-530-checker-loops5",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-530-checker-loops5-expected-stdout",
diff --git a/test/530-checker-lse-ctor-fences/Android.bp b/test/530-checker-lse-ctor-fences/Android.bp
index 8a5f6aa..961f528 100644
--- a/test/530-checker-lse-ctor-fences/Android.bp
+++ b/test/530-checker-lse-ctor-fences/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-530-checker-lse-ctor-fences",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-530-checker-lse-ctor-fences-expected-stdout",
diff --git a/test/530-checker-lse-simd/Android.bp b/test/530-checker-lse-simd/Android.bp
index e3c86cf..ff1deb6 100644
--- a/test/530-checker-lse-simd/Android.bp
+++ b/test/530-checker-lse-simd/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-530-checker-lse-simd",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-530-checker-lse-simd-expected-stdout",
diff --git a/test/530-checker-lse2/Android.bp b/test/530-checker-lse2/Android.bp
index 4d85205..6d5d7a7 100644
--- a/test/530-checker-lse2/Android.bp
+++ b/test/530-checker-lse2/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-530-checker-lse2",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-530-checker-lse2-expected-stdout",
diff --git a/test/532-checker-nonnull-arrayset/Android.bp b/test/532-checker-nonnull-arrayset/Android.bp
index d2a9b02..eb3532e 100644
--- a/test/532-checker-nonnull-arrayset/Android.bp
+++ b/test/532-checker-nonnull-arrayset/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-532-checker-nonnull-arrayset",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-532-checker-nonnull-arrayset-expected-stdout",
diff --git a/test/534-checker-bce-deoptimization/Android.bp b/test/534-checker-bce-deoptimization/Android.bp
index a7e87e1..bd26dae 100644
--- a/test/534-checker-bce-deoptimization/Android.bp
+++ b/test/534-checker-bce-deoptimization/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-534-checker-bce-deoptimization",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-534-checker-bce-deoptimization-expected-stdout",
diff --git a/test/536-checker-intrinsic-optimization/Android.bp b/test/536-checker-intrinsic-optimization/Android.bp
index b4e2f63..e4a1697 100644
--- a/test/536-checker-intrinsic-optimization/Android.bp
+++ b/test/536-checker-intrinsic-optimization/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-536-checker-intrinsic-optimization",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-536-checker-intrinsic-optimization-expected-stdout",
diff --git a/test/537-checker-arraycopy/Android.bp b/test/537-checker-arraycopy/Android.bp
index 70edd9b..c1f3858 100644
--- a/test/537-checker-arraycopy/Android.bp
+++ b/test/537-checker-arraycopy/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-537-checker-arraycopy",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-537-checker-arraycopy-expected-stdout",
diff --git a/test/537-checker-jump-over-jump/Android.bp b/test/537-checker-jump-over-jump/Android.bp
index 6a4ef9a..15c6794 100644
--- a/test/537-checker-jump-over-jump/Android.bp
+++ b/test/537-checker-jump-over-jump/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-537-checker-jump-over-jump",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-537-checker-jump-over-jump-expected-stdout",
diff --git a/test/538-checker-embed-constants/Android.bp b/test/538-checker-embed-constants/Android.bp
index 8c23e53..4de4eaa 100644
--- a/test/538-checker-embed-constants/Android.bp
+++ b/test/538-checker-embed-constants/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-538-checker-embed-constants",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-538-checker-embed-constants-expected-stdout",
diff --git a/test/540-checker-rtp-bug/Android.bp b/test/540-checker-rtp-bug/Android.bp
index 6c9ef1e..d793477 100644
--- a/test/540-checker-rtp-bug/Android.bp
+++ b/test/540-checker-rtp-bug/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-540-checker-rtp-bug",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-540-checker-rtp-bug-expected-stdout",
diff --git a/test/548-checker-inlining-and-dce/Android.bp b/test/548-checker-inlining-and-dce/Android.bp
index 46dd3b9..cae40d3 100644
--- a/test/548-checker-inlining-and-dce/Android.bp
+++ b/test/548-checker-inlining-and-dce/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-548-checker-inlining-and-dce",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-548-checker-inlining-and-dce-expected-stdout",
diff --git a/test/549-checker-types-merge/Android.bp b/test/549-checker-types-merge/Android.bp
index 9ca0f0b..71059eb 100644
--- a/test/549-checker-types-merge/Android.bp
+++ b/test/549-checker-types-merge/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-549-checker-types-merge",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-549-checker-types-merge-expected-stdout",
diff --git a/test/550-checker-multiply-accumulate/Android.bp b/test/550-checker-multiply-accumulate/Android.bp
index 666726f..57cc2d5 100644
--- a/test/550-checker-multiply-accumulate/Android.bp
+++ b/test/550-checker-multiply-accumulate/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-550-checker-multiply-accumulate",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-550-checker-multiply-accumulate-expected-stdout",
diff --git a/test/551-checker-clinit/Android.bp b/test/551-checker-clinit/Android.bp
index ba5bcbe..f153f5d 100644
--- a/test/551-checker-clinit/Android.bp
+++ b/test/551-checker-clinit/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-551-checker-clinit",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-551-checker-clinit-expected-stdout",
diff --git a/test/552-checker-x86-avx2-bit-manipulation/Android.bp b/test/552-checker-x86-avx2-bit-manipulation/Android.bp
index 7d49a89..a331a0e 100644
--- a/test/552-checker-x86-avx2-bit-manipulation/Android.bp
+++ b/test/552-checker-x86-avx2-bit-manipulation/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-552-checker-x86-avx2-bit-manipulation",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-552-checker-x86-avx2-bit-manipulation-expected-stdout",
diff --git a/test/554-checker-rtp-checkcast/Android.bp b/test/554-checker-rtp-checkcast/Android.bp
index c3fc3cc..5dd5642 100644
--- a/test/554-checker-rtp-checkcast/Android.bp
+++ b/test/554-checker-rtp-checkcast/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-554-checker-rtp-checkcast",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-554-checker-rtp-checkcast-expected-stdout",
diff --git a/test/557-checker-instruct-simplifier-ror/Android.bp b/test/557-checker-instruct-simplifier-ror/Android.bp
index 1e19570..1eeb684 100644
--- a/test/557-checker-instruct-simplifier-ror/Android.bp
+++ b/test/557-checker-instruct-simplifier-ror/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-557-checker-instruct-simplifier-ror",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-557-checker-instruct-simplifier-ror-expected-stdout",
diff --git a/test/559-checker-rtp-ifnotnull/Android.bp b/test/559-checker-rtp-ifnotnull/Android.bp
index a23d57e..d833ebc 100644
--- a/test/559-checker-rtp-ifnotnull/Android.bp
+++ b/test/559-checker-rtp-ifnotnull/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-559-checker-rtp-ifnotnull",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-559-checker-rtp-ifnotnull-expected-stdout",
diff --git a/test/563-checker-invoke-super/Android.bp b/test/563-checker-invoke-super/Android.bp
index 34ecdfe..6cea83a 100644
--- a/test/563-checker-invoke-super/Android.bp
+++ b/test/563-checker-invoke-super/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-563-checker-invoke-super",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-563-checker-invoke-super-expected-stdout",
diff --git a/test/564-checker-bitcount/Android.bp b/test/564-checker-bitcount/Android.bp
index 8f1e9d9..26a9c95 100644
--- a/test/564-checker-bitcount/Android.bp
+++ b/test/564-checker-bitcount/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-564-checker-bitcount",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-564-checker-bitcount-expected-stdout",
diff --git a/test/564-checker-inline-loop/Android.bp b/test/564-checker-inline-loop/Android.bp
index 6cc6189..50fdd2b 100644
--- a/test/564-checker-inline-loop/Android.bp
+++ b/test/564-checker-inline-loop/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-564-checker-inline-loop",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-564-checker-inline-loop-expected-stdout",
diff --git a/test/564-checker-negbitwise/Android.bp b/test/564-checker-negbitwise/Android.bp
index 45247eb..c83c816 100644
--- a/test/564-checker-negbitwise/Android.bp
+++ b/test/564-checker-negbitwise/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-564-checker-negbitwise",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-564-checker-negbitwise-expected-stdout",
diff --git a/test/565-checker-condition-liveness/Android.bp b/test/565-checker-condition-liveness/Android.bp
index f71fd9b..09ac0e0 100644
--- a/test/565-checker-condition-liveness/Android.bp
+++ b/test/565-checker-condition-liveness/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-565-checker-condition-liveness",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-565-checker-condition-liveness-expected-stdout",
diff --git a/test/566-checker-codegen-select/Android.bp b/test/566-checker-codegen-select/Android.bp
index aad559f..2259c47 100644
--- a/test/566-checker-codegen-select/Android.bp
+++ b/test/566-checker-codegen-select/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-566-checker-codegen-select",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-566-checker-codegen-select-expected-stdout",
diff --git a/test/567-checker-builder-intrinsics/Android.bp b/test/567-checker-builder-intrinsics/Android.bp
index bc2ca9e..bef884b 100644
--- a/test/567-checker-builder-intrinsics/Android.bp
+++ b/test/567-checker-builder-intrinsics/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-567-checker-builder-intrinsics",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-567-checker-builder-intrinsics-expected-stdout",
diff --git a/test/568-checker-onebit/Android.bp b/test/568-checker-onebit/Android.bp
index d2d615d..c2b290f 100644
--- a/test/568-checker-onebit/Android.bp
+++ b/test/568-checker-onebit/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-568-checker-onebit",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-568-checker-onebit-expected-stdout",
diff --git a/test/570-checker-select/Android.bp b/test/570-checker-select/Android.bp
index 9a51570..37c5198 100644
--- a/test/570-checker-select/Android.bp
+++ b/test/570-checker-select/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-570-checker-select",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-570-checker-select-expected-stdout",
diff --git a/test/572-checker-array-get-regression/Android.bp b/test/572-checker-array-get-regression/Android.bp
index bbd6107..5b4aee3 100644
--- a/test/572-checker-array-get-regression/Android.bp
+++ b/test/572-checker-array-get-regression/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-572-checker-array-get-regression",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-572-checker-array-get-regression-expected-stdout",
diff --git a/test/573-checker-checkcast-regression/Android.bp b/test/573-checker-checkcast-regression/Android.bp
index 3aa4ab8..37d19a5 100644
--- a/test/573-checker-checkcast-regression/Android.bp
+++ b/test/573-checker-checkcast-regression/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-573-checker-checkcast-regression",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-573-checker-checkcast-regression-expected-stdout",
diff --git a/test/577-checker-fp2int/Android.bp b/test/577-checker-fp2int/Android.bp
index 109aa8a..537df23 100644
--- a/test/577-checker-fp2int/Android.bp
+++ b/test/577-checker-fp2int/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-577-checker-fp2int",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-577-checker-fp2int-expected-stdout",
diff --git a/test/580-checker-round/Android.bp b/test/580-checker-round/Android.bp
index cb30ae6..3969b80 100644
--- a/test/580-checker-round/Android.bp
+++ b/test/580-checker-round/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-580-checker-round",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-580-checker-round-expected-stdout",
diff --git a/test/582-checker-bce-length/Android.bp b/test/582-checker-bce-length/Android.bp
index 8a37086..42a2345 100644
--- a/test/582-checker-bce-length/Android.bp
+++ b/test/582-checker-bce-length/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-582-checker-bce-length",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-582-checker-bce-length-expected-stdout",
diff --git a/test/583-checker-zero/Android.bp b/test/583-checker-zero/Android.bp
index 31cd9af..eb9b16e 100644
--- a/test/583-checker-zero/Android.bp
+++ b/test/583-checker-zero/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-583-checker-zero",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-583-checker-zero-expected-stdout",
diff --git a/test/584-checker-div-bool/Android.bp b/test/584-checker-div-bool/Android.bp
index 781fe54..8201fc5 100644
--- a/test/584-checker-div-bool/Android.bp
+++ b/test/584-checker-div-bool/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-584-checker-div-bool",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-584-checker-div-bool-expected-stdout",
diff --git a/test/590-checker-arr-set-null-regression/Android.bp b/test/590-checker-arr-set-null-regression/Android.bp
index 7716540..e0f0145 100644
--- a/test/590-checker-arr-set-null-regression/Android.bp
+++ b/test/590-checker-arr-set-null-regression/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-590-checker-arr-set-null-regression",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-590-checker-arr-set-null-regression-expected-stdout",
diff --git a/test/591-checker-regression-dead-loop/Android.bp b/test/591-checker-regression-dead-loop/Android.bp
index 9f3d098..33558a7 100644
--- a/test/591-checker-regression-dead-loop/Android.bp
+++ b/test/591-checker-regression-dead-loop/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-591-checker-regression-dead-loop",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-591-checker-regression-dead-loop-expected-stdout",
diff --git a/test/593-checker-long-2-float-regression/Android.bp b/test/593-checker-long-2-float-regression/Android.bp
index fca51bb..b367b9b 100644
--- a/test/593-checker-long-2-float-regression/Android.bp
+++ b/test/593-checker-long-2-float-regression/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-593-checker-long-2-float-regression",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-593-checker-long-2-float-regression-expected-stdout",
diff --git a/test/594-checker-array-alias/Android.bp b/test/594-checker-array-alias/Android.bp
index e432f94..e446843 100644
--- a/test/594-checker-array-alias/Android.bp
+++ b/test/594-checker-array-alias/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-594-checker-array-alias",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-594-checker-array-alias-expected-stdout",
diff --git a/test/603-checker-instanceof/Android.bp b/test/603-checker-instanceof/Android.bp
index 4550a24..695f86c 100644
--- a/test/603-checker-instanceof/Android.bp
+++ b/test/603-checker-instanceof/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-603-checker-instanceof",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-603-checker-instanceof-expected-stdout",
diff --git a/test/609-checker-inline-interface/Android.bp b/test/609-checker-inline-interface/Android.bp
index d8c19bb..dbb1510 100644
--- a/test/609-checker-inline-interface/Android.bp
+++ b/test/609-checker-inline-interface/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-609-checker-inline-interface",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-609-checker-inline-interface-expected-stdout",
diff --git a/test/609-checker-x86-bounds-check/Android.bp b/test/609-checker-x86-bounds-check/Android.bp
index e8e724d..ce31a86 100644
--- a/test/609-checker-x86-bounds-check/Android.bp
+++ b/test/609-checker-x86-bounds-check/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-609-checker-x86-bounds-check",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-609-checker-x86-bounds-check-expected-stdout",
diff --git a/test/611-checker-simplify-if/Android.bp b/test/611-checker-simplify-if/Android.bp
index 94a2bc8..3ba1cb0 100644
--- a/test/611-checker-simplify-if/Android.bp
+++ b/test/611-checker-simplify-if/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-611-checker-simplify-if",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-611-checker-simplify-if-expected-stdout",
diff --git a/test/614-checker-dump-constant-location/Android.bp b/test/614-checker-dump-constant-location/Android.bp
index 67cb052..ac338e1 100644
--- a/test/614-checker-dump-constant-location/Android.bp
+++ b/test/614-checker-dump-constant-location/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-614-checker-dump-constant-location",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-614-checker-dump-constant-location-expected-stdout",
diff --git a/test/615-checker-arm64-store-zero/Android.bp b/test/615-checker-arm64-store-zero/Android.bp
index ba1705e..76047f8 100644
--- a/test/615-checker-arm64-store-zero/Android.bp
+++ b/test/615-checker-arm64-store-zero/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-615-checker-arm64-store-zero",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-615-checker-arm64-store-zero-expected-stdout",
diff --git a/test/618-checker-induction/Android.bp b/test/618-checker-induction/Android.bp
index c642a34..f6bdb82 100644
--- a/test/618-checker-induction/Android.bp
+++ b/test/618-checker-induction/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-618-checker-induction",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-618-checker-induction-expected-stdout",
diff --git a/test/619-checker-current-method/Android.bp b/test/619-checker-current-method/Android.bp
index 7b7dc14..bde4234 100644
--- a/test/619-checker-current-method/Android.bp
+++ b/test/619-checker-current-method/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-619-checker-current-method",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-619-checker-current-method-expected-stdout",
diff --git a/test/620-checker-bce-intrinsics/Android.bp b/test/620-checker-bce-intrinsics/Android.bp
index 4356cc9..5368143 100644
--- a/test/620-checker-bce-intrinsics/Android.bp
+++ b/test/620-checker-bce-intrinsics/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-620-checker-bce-intrinsics",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-620-checker-bce-intrinsics-expected-stdout",
diff --git a/test/622-checker-bce-regressions/Android.bp b/test/622-checker-bce-regressions/Android.bp
index f5a2c4c..15bb9c7 100644
--- a/test/622-checker-bce-regressions/Android.bp
+++ b/test/622-checker-bce-regressions/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-622-checker-bce-regressions",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-622-checker-bce-regressions-expected-stdout",
diff --git a/test/625-checker-licm-regressions/Android.bp b/test/625-checker-licm-regressions/Android.bp
index 4df508a..1ccc5bf 100644
--- a/test/625-checker-licm-regressions/Android.bp
+++ b/test/625-checker-licm-regressions/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-625-checker-licm-regressions",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-625-checker-licm-regressions-expected-stdout",
diff --git a/test/627-checker-unroll/Android.bp b/test/627-checker-unroll/Android.bp
index a6b9a78..0050384 100644
--- a/test/627-checker-unroll/Android.bp
+++ b/test/627-checker-unroll/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-627-checker-unroll",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-627-checker-unroll-expected-stdout",
diff --git a/test/631-checker-get-class/Android.bp b/test/631-checker-get-class/Android.bp
index 9cfdaac..ad283b9 100644
--- a/test/631-checker-get-class/Android.bp
+++ b/test/631-checker-get-class/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-631-checker-get-class",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-631-checker-get-class-expected-stdout",
diff --git a/test/632-checker-char-at-bounds/Android.bp b/test/632-checker-char-at-bounds/Android.bp
index b832cd5..afeeeb7 100644
--- a/test/632-checker-char-at-bounds/Android.bp
+++ b/test/632-checker-char-at-bounds/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-632-checker-char-at-bounds",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-632-checker-char-at-bounds-expected-stdout",
diff --git a/test/635-checker-arm64-volatile-load-cc/Android.bp b/test/635-checker-arm64-volatile-load-cc/Android.bp
index 7946892..bf3e5db 100644
--- a/test/635-checker-arm64-volatile-load-cc/Android.bp
+++ b/test/635-checker-arm64-volatile-load-cc/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-635-checker-arm64-volatile-load-cc",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-635-checker-arm64-volatile-load-cc-expected-stdout",
diff --git a/test/637-checker-throw-inline/Android.bp b/test/637-checker-throw-inline/Android.bp
index fbaccf8..6624dce 100644
--- a/test/637-checker-throw-inline/Android.bp
+++ b/test/637-checker-throw-inline/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-637-checker-throw-inline",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-637-checker-throw-inline-expected-stdout",
diff --git a/test/640-checker-boolean-simd/Android.bp b/test/640-checker-boolean-simd/Android.bp
index c130cdd..f158fea 100644
--- a/test/640-checker-boolean-simd/Android.bp
+++ b/test/640-checker-boolean-simd/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-640-checker-boolean-simd",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-640-checker-boolean-simd-expected-stdout",
diff --git a/test/640-checker-integer-valueof/Android.bp b/test/640-checker-integer-valueof/Android.bp
index c4c91b9..d79fda6 100644
--- a/test/640-checker-integer-valueof/Android.bp
+++ b/test/640-checker-integer-valueof/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-640-checker-integer-valueof",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-640-checker-integer-valueof-expected-stdout",
diff --git a/test/640-checker-simd/Android.bp b/test/640-checker-simd/Android.bp
index ded011c..e635eba 100644
--- a/test/640-checker-simd/Android.bp
+++ b/test/640-checker-simd/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-640-checker-simd",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-640-checker-simd-expected-stdout",
diff --git a/test/641-checker-arraycopy/Android.bp b/test/641-checker-arraycopy/Android.bp
index 98e90eb..9f42de8 100644
--- a/test/641-checker-arraycopy/Android.bp
+++ b/test/641-checker-arraycopy/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-641-checker-arraycopy",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-641-checker-arraycopy-expected-stdout",
diff --git a/test/643-checker-bogus-ic/Android.bp b/test/643-checker-bogus-ic/Android.bp
index a6da24b..52c8d5c 100644
--- a/test/643-checker-bogus-ic/Android.bp
+++ b/test/643-checker-bogus-ic/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-643-checker-bogus-ic",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-643-checker-bogus-ic-expected-stdout",
diff --git a/test/645-checker-abs-simd/Android.bp b/test/645-checker-abs-simd/Android.bp
index 6a03f3b..d5f4a66 100644
--- a/test/645-checker-abs-simd/Android.bp
+++ b/test/645-checker-abs-simd/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-645-checker-abs-simd",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-645-checker-abs-simd-expected-stdout",
diff --git a/test/646-checker-arraycopy-large-cst-pos/Android.bp b/test/646-checker-arraycopy-large-cst-pos/Android.bp
index 678eb95..0ea35c7 100644
--- a/test/646-checker-arraycopy-large-cst-pos/Android.bp
+++ b/test/646-checker-arraycopy-large-cst-pos/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-646-checker-arraycopy-large-cst-pos",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-646-checker-arraycopy-large-cst-pos-expected-stdout",
diff --git a/test/646-checker-long-const-to-int/Android.bp b/test/646-checker-long-const-to-int/Android.bp
index 3223bc0..709397d 100644
--- a/test/646-checker-long-const-to-int/Android.bp
+++ b/test/646-checker-long-const-to-int/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-646-checker-long-const-to-int",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-646-checker-long-const-to-int-expected-stdout",
diff --git a/test/646-checker-simd-hadd/Android.bp b/test/646-checker-simd-hadd/Android.bp
index e541633..8e54103 100644
--- a/test/646-checker-simd-hadd/Android.bp
+++ b/test/646-checker-simd-hadd/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-646-checker-simd-hadd",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-646-checker-simd-hadd-expected-stdout",
diff --git a/test/650-checker-inline-access-thunks/Android.bp b/test/650-checker-inline-access-thunks/Android.bp
index 40f9e5a..116bc6b 100644
--- a/test/650-checker-inline-access-thunks/Android.bp
+++ b/test/650-checker-inline-access-thunks/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-650-checker-inline-access-thunks",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-650-checker-inline-access-thunks-expected-stdout",
diff --git a/test/654-checker-periodic/Android.bp b/test/654-checker-periodic/Android.bp
index 9144c67..ed6712e 100644
--- a/test/654-checker-periodic/Android.bp
+++ b/test/654-checker-periodic/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-654-checker-periodic",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-654-checker-periodic-expected-stdout",
diff --git a/test/655-checker-simd-arm-opt/Android.bp b/test/655-checker-simd-arm-opt/Android.bp
index cebb64a..3f61b9b 100644
--- a/test/655-checker-simd-arm-opt/Android.bp
+++ b/test/655-checker-simd-arm-opt/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-655-checker-simd-arm-opt",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-655-checker-simd-arm-opt-expected-stdout",
diff --git a/test/656-checker-simd-opt/Android.bp b/test/656-checker-simd-opt/Android.bp
index 9e446f4..462c0cf 100644
--- a/test/656-checker-simd-opt/Android.bp
+++ b/test/656-checker-simd-opt/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-656-checker-simd-opt",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-656-checker-simd-opt-expected-stdout",
diff --git a/test/660-checker-sad/Android.bp b/test/660-checker-sad/Android.bp
index a226b95..07ee960 100644
--- a/test/660-checker-sad/Android.bp
+++ b/test/660-checker-sad/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-660-checker-sad",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-660-checker-sad-expected-stdout",
diff --git a/test/660-checker-simd-sad/Android.bp b/test/660-checker-simd-sad/Android.bp
index 06cc66c..f93f93a 100644
--- a/test/660-checker-simd-sad/Android.bp
+++ b/test/660-checker-simd-sad/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-660-checker-simd-sad",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-660-checker-simd-sad-expected-stdout",
diff --git a/test/661-checker-simd-reduc/Android.bp b/test/661-checker-simd-reduc/Android.bp
index bb4403d..ab7da51 100644
--- a/test/661-checker-simd-reduc/Android.bp
+++ b/test/661-checker-simd-reduc/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-661-checker-simd-reduc",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-661-checker-simd-reduc-expected-stdout",
diff --git a/test/665-checker-simd-zero/Android.bp b/test/665-checker-simd-zero/Android.bp
index c6a0c62..ed5e979 100644
--- a/test/665-checker-simd-zero/Android.bp
+++ b/test/665-checker-simd-zero/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-665-checker-simd-zero",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-665-checker-simd-zero-expected-stdout",
diff --git a/test/667-checker-simd-alignment/Android.bp b/test/667-checker-simd-alignment/Android.bp
index 08f26bb..3bb0b73 100644
--- a/test/667-checker-simd-alignment/Android.bp
+++ b/test/667-checker-simd-alignment/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-667-checker-simd-alignment",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-667-checker-simd-alignment-expected-stdout",
diff --git a/test/669-checker-break/Android.bp b/test/669-checker-break/Android.bp
index 0e0a51b..88e1ef1 100644
--- a/test/669-checker-break/Android.bp
+++ b/test/669-checker-break/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-669-checker-break",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-669-checker-break-expected-stdout",
diff --git a/test/672-checker-throw-method/Android.bp b/test/672-checker-throw-method/Android.bp
index 154cba2..e617b07 100644
--- a/test/672-checker-throw-method/Android.bp
+++ b/test/672-checker-throw-method/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-672-checker-throw-method",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-672-checker-throw-method-expected-stdout",
diff --git a/test/673-checker-throw-vmethod/Android.bp b/test/673-checker-throw-vmethod/Android.bp
index a70cf23..8b1233f 100644
--- a/test/673-checker-throw-vmethod/Android.bp
+++ b/test/673-checker-throw-vmethod/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-673-checker-throw-vmethod",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-673-checker-throw-vmethod-expected-stdout",
diff --git a/test/684-checker-simd-dotprod/Android.bp b/test/684-checker-simd-dotprod/Android.bp
index 553dc6c..9e7ecfa 100644
--- a/test/684-checker-simd-dotprod/Android.bp
+++ b/test/684-checker-simd-dotprod/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-684-checker-simd-dotprod",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-684-checker-simd-dotprod-expected-stdout",
diff --git a/test/697-checker-string-append/Android.bp b/test/697-checker-string-append/Android.bp
index eaa2811..bf40785 100644
--- a/test/697-checker-string-append/Android.bp
+++ b/test/697-checker-string-append/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-697-checker-string-append",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-697-checker-string-append-expected-stdout",
diff --git a/test/711-checker-type-conversion/Android.bp b/test/711-checker-type-conversion/Android.bp
index da16e82..412ccf7 100644
--- a/test/711-checker-type-conversion/Android.bp
+++ b/test/711-checker-type-conversion/Android.bp
@@ -6,7 +6,7 @@
java_test {
name: "art-run-test-711-checker-type-conversion",
defaults: ["art-run-test-defaults"],
- test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+ test_config_template: ":art-run-test-target-template",
srcs: ["src/**/*.java"],
data: [
":art-run-test-711-checker-type-conversion-expected-stdout",
diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files
index 390b383..d8efc56 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -49,7 +49,7 @@
# Known failing ART run-tests.
# TODO(rpl): Investigate and address the causes of failures.
-known_failing_tests = frozenset([
+known_failing_tests = [
"004-SignalTest",
"004-UnsafeTest",
"030-bad-finalizer",
@@ -283,8 +283,103 @@
"995-breakpoints-throw",
"996-breakpoint-obsolete",
"997-single-step",
+]
+
+# More known failing tests, related to Checker.
+# TODO(rpl): Investigate and address the causes of failures.
+known_failing_tests.extend([
+ # Fails (on flame-userdebug) with:
+ #
+ # java.lang.RuntimeException: Error running Checker
+ # error: Statement could not be matched starting from line 564575
+ # RemTest.java:289: lsr x{{\d+}}, x{{\d+}}, #32
+ # ISA_FEATURES = {'a53': True, 'crc': True, 'lse': False, 'fp16': False, 'dotprod': False, 'sve': False}
+ #
+ "411-checker-hdiv-hrem-const",
+ # Fails (on aosp_cf_x86_phone-userdebug) with:
+ #
+ # Error while running Checker: java.lang.RuntimeException: Error running Checker command:
+ # error: Statement could not be matched starting from line 317325
+ # Main.java:296: InvokeStaticOrDirect
+ # ISA_FEATURES = {'ssse3': True, 'sse4': False}
+ # NewInstance = l6
+ #
+ "476-checker-ctor-fence-redun-elim",
+ # Fails (on aosp_cf_x86_phone-userdebug) with:
+ #
+ # Error while running Checker: java.lang.RuntimeException: Error running Checker command:
+ # error: Statement could not be matched starting from line 264874
+ # Main.java:77: InvokeStaticOrDirect [{{([ij]\d+,)?}}<<ClinitCheck>>]
+ # ClinitCheck = l4
+ # ISA_FEATURES = {'ssse3': True, 'sse4': False}
+ # LoadClass = l3
+ #
+ "478-checker-clinit-check-pruning",
+ # Fails (on aosp_cf_x86_phone-userdebug) with:
+ #
+ # Error while running Checker: java.lang.RuntimeException: Error running Checker command:
+ # error: Statement could not be matched starting from line 124181
+ # Main.java:178: <<Arg:z\d+>> StaticFieldGet liveness:<<ArgLiv:\d+>> ranges:{[<<ArgLiv>>,<<ArgUse:\d+>>)} uses:[<<ArgUse>>]
+ # ISA_FEATURES = {'ssse3': True, 'sse4': False}
+ #
+ "482-checker-loop-back-edge-use",
+ # Fails (on aosp_cf_x86_phone-userdebug) with:
+ #
+ # Error while running Checker: java.lang.RuntimeException: Error running Checker command:
+ # error: Statement could not be matched starting from line 7333
+ # Main.java:66: <<t1:i\d+>> Add [<<Arg>>,<<Const1>>] {{.*->e(bp|si|di)}}
+ # Arg = i0
+ # Const1 = i3
+ # ISA_FEATURES = {'ssse3': True, 'sse4': False}
+ #
+ "526-checker-caller-callee-regs",
+ # Fails (on aosp_cf_x86_phone-userdebug) with:
+ #
+ # Error while running Checker: java.lang.RuntimeException: Error running Checker command:
+ # error: NOT statement matched line 379347
+ # Main.java:538: NewInstance
+ # ISA_FEATURES = {'ssse3': True, 'sse4': False}
+ #
+ "530-checker-lse",
+ # Fails (on aosp_cf_x86_phone-userdebug) with:
+ #
+ # Error while running Checker: java.lang.RuntimeException: Error running Checker command:
+ # error: NOT statement matched line 238857
+ # Main.java:650: Shl
+ # ISA_FEATURES = {'ssse3': True, 'sse4': False}
+ #
+ "551-checker-shifter-operand",
+ # Fails (on aosp_cf_x86_phone-userdebug) with:
+ #
+ # Error while running Checker: java.lang.RuntimeException: Error running Checker command:
+ # error: Statement could not be matched starting from line 158575
+ # Main.java:97: X86ComputeBaseMethodAddress
+ # ISA_FEATURES = {'ssse3': True, 'sse4': False}
+ #
+ "552-checker-sharpening",
+ # Fails (on flame-userdebug) with:
+ #
+ # java.lang.RuntimeException: Error running Checker
+ # error: Statement could not be matched starting from line 11964
+ # Main.java:59: <<ConstM42:i\d+>> IntConstant -42
+ # ISA_FEATURES = {'a53': True, 'crc': True, 'lse': False, 'fp16': False, 'dotprod': False, 'sve': False}
+ #
+ #
+ "562-checker-no-intermediate",
+ # Fails (on aosp_cf_x86_phone-userdebug) with:
+ #
+ # Error while running Checker: java.lang.RuntimeException: Error running Checker command:
+ # error: Statement could not be matched starting from line 149082
+ # Main.java:312: <<LoadClass:l\d+>> LoadClass class_name:Main
+ # ISA_FEATURES = {'ssse3': True, 'sse4': False}
+ # Int42 = i8
+ # Int43 = i10
+ #
+ "639-checker-code-sinking",
])
+known_failing_tests = frozenset(known_failing_tests)
+
# Percentage of ART run-tests (among the ones expected to succeed) to include in
# the `presubmit` test group in `TEST_MAPPING` file -- the rest will be included
# in `postsubmit` test group.
@@ -303,13 +398,8 @@
return re.match("^[0-9]+-checker-", run_test)
# Is `run_test` expected to succeed?
-#
-# Also temporarily consider Checker tests as known failing tests, as they
-# currently break some test runs (see b/169852871).
-# TODO(b/162408889): Complete Checker integration and re-include Checker
-# tests in test mapping.
def is_expected_succeeding(run_test):
- return run_test not in known_failing_tests and not is_checker_test(run_test)
+ return run_test not in known_failing_tests
class Generator: