diff options
| author | 2020-10-13 12:10:59 +0100 | |
|---|---|---|
| committer | 2020-10-14 08:01:06 +0000 | |
| commit | 4258f9e2f19016e04a71ec2b5349b707f8f47a18 (patch) | |
| tree | bd587ca13be99c9c8e1d2781719b75a887ca5897 /test | |
| parent | 4b9f86bd04a905e6ee6eaf5363b0967315136096 (diff) | |
Only tag supported ART run-tests as part of `art-target-run-test`.
All ART (target) run-tests supported at the build-level have been
tagged as part of the `art-target-run-test` TradeFed test suite;
however, only a part of them are actually expected to suceed at run
time at the moment, meaning that many tests are currently failing on
the postsubmit configuration running tests tagged as
`art-target-run-test` (currently running only on crosshatch devices).
To avoid this, use a different test configuration template for test
expected to succeed and for test expected to fail, and only have the
former test configuration template tag the test as part of the
`art-target-run-test` test suite.
Test: atest --test-mapping art:all
Test: Rely on ATP post-submit testing
Bug: 152374989
Bug: 147812905
Change-Id: I29ecc1d3021765cb5467f3a6f4e9d64afc4caead
Diffstat (limited to 'test')
620 files changed, 722 insertions, 20 deletions
diff --git a/test/001-HelloWorld/Android.bp b/test/001-HelloWorld/Android.bp index 3aa7b3169f..676b1d4b42 100644 --- a/test/001-HelloWorld/Android.bp +++ b/test/001-HelloWorld/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-001-HelloWorld", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-001-HelloWorld-expected"], } diff --git a/test/001-Main/Android.bp b/test/001-Main/Android.bp index 8df9718c58..b7dc8ee29b 100644 --- a/test/001-Main/Android.bp +++ b/test/001-Main/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-001-Main", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-001-Main-expected"], } diff --git a/test/002-sleep/Android.bp b/test/002-sleep/Android.bp index c353931a42..f3fe282cf8 100644 --- a/test/002-sleep/Android.bp +++ b/test/002-sleep/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-002-sleep", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-002-sleep-expected"], } diff --git a/test/004-InterfaceTest/Android.bp b/test/004-InterfaceTest/Android.bp index 3ba252e9cd..85d1ee39f6 100644 --- a/test/004-InterfaceTest/Android.bp +++ b/test/004-InterfaceTest/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-004-InterfaceTest", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-004-InterfaceTest-expected"], } diff --git a/test/004-SignalTest/Android.bp b/test/004-SignalTest/Android.bp index 8be1625a10..cf0e4af5cc 100644 --- a/test/004-SignalTest/Android.bp +++ b/test/004-SignalTest/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-004-SignalTest", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-004-SignalTest-expected"], } diff --git a/test/004-UnsafeTest/Android.bp b/test/004-UnsafeTest/Android.bp index 21a3a3ee02..6dd5af799e 100644 --- a/test/004-UnsafeTest/Android.bp +++ b/test/004-UnsafeTest/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-004-UnsafeTest", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-004-UnsafeTest-expected"], } diff --git a/test/004-checker-UnsafeTest18/Android.bp b/test/004-checker-UnsafeTest18/Android.bp index a58b12bed2..fb8c9c6923 100644 --- a/test/004-checker-UnsafeTest18/Android.bp +++ b/test/004-checker-UnsafeTest18/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-004-checker-UnsafeTest18-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/006-args/Android.bp b/test/006-args/Android.bp index 1f70413979..5bd2d1cf1d 100644 --- a/test/006-args/Android.bp +++ b/test/006-args/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-006-args", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-006-args-expected"], } diff --git a/test/007-count10/Android.bp b/test/007-count10/Android.bp index 5015eb9b4a..2f353b62d0 100644 --- a/test/007-count10/Android.bp +++ b/test/007-count10/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-007-count10", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-007-count10-expected"], } diff --git a/test/009-instanceof/Android.bp b/test/009-instanceof/Android.bp index 3158843f2d..2f97b0abbb 100644 --- a/test/009-instanceof/Android.bp +++ b/test/009-instanceof/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-009-instanceof", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-009-instanceof-expected"], } diff --git a/test/010-instance/Android.bp b/test/010-instance/Android.bp index 34e1cb7eca..aac75327c1 100644 --- a/test/010-instance/Android.bp +++ b/test/010-instance/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-010-instance", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-010-instance-expected"], } diff --git a/test/011-array-copy/Android.bp b/test/011-array-copy/Android.bp index 2fd3e312a9..354efdd74c 100644 --- a/test/011-array-copy/Android.bp +++ b/test/011-array-copy/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-011-array-copy", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-011-array-copy-expected"], } diff --git a/test/012-math/Android.bp b/test/012-math/Android.bp index 5b323d1212..05599449a3 100644 --- a/test/012-math/Android.bp +++ b/test/012-math/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-012-math", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-012-math-expected"], } diff --git a/test/013-math2/Android.bp b/test/013-math2/Android.bp index a8a1424944..26d94fd14c 100644 --- a/test/013-math2/Android.bp +++ b/test/013-math2/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-013-math2", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-013-math2-expected"], } diff --git a/test/014-math3/Android.bp b/test/014-math3/Android.bp index 609c1c3d71..818cd3a9b1 100644 --- a/test/014-math3/Android.bp +++ b/test/014-math3/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-014-math3", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-014-math3-expected"], } diff --git a/test/015-switch/Android.bp b/test/015-switch/Android.bp index 7b6e2f64a4..b38c716226 100644 --- a/test/015-switch/Android.bp +++ b/test/015-switch/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-015-switch", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-015-switch-expected"], } diff --git a/test/016-intern/Android.bp b/test/016-intern/Android.bp index 73081a7d99..0bf003a020 100644 --- a/test/016-intern/Android.bp +++ b/test/016-intern/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-016-intern", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-016-intern-expected"], } diff --git a/test/017-float/Android.bp b/test/017-float/Android.bp index 8ae9c6d242..4b0dee72d3 100644 --- a/test/017-float/Android.bp +++ b/test/017-float/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-017-float", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-017-float-expected"], } diff --git a/test/018-stack-overflow/Android.bp b/test/018-stack-overflow/Android.bp index 738236b224..1b1b42db94 100644 --- a/test/018-stack-overflow/Android.bp +++ b/test/018-stack-overflow/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-018-stack-overflow", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-018-stack-overflow-expected"], } diff --git a/test/019-wrong-array-type/Android.bp b/test/019-wrong-array-type/Android.bp index c460dcec8f..c629a665c2 100644 --- a/test/019-wrong-array-type/Android.bp +++ b/test/019-wrong-array-type/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-019-wrong-array-type", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-019-wrong-array-type-expected"], } diff --git a/test/020-string/Android.bp b/test/020-string/Android.bp index bbf91b1d77..7689db6f95 100644 --- a/test/020-string/Android.bp +++ b/test/020-string/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-020-string", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-020-string-expected"], } diff --git a/test/021-string2/Android.bp b/test/021-string2/Android.bp index d07f52b6af..b4c3d4736a 100644 --- a/test/021-string2/Android.bp +++ b/test/021-string2/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-021-string2", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-021-string2-expected"], } diff --git a/test/022-interface/Android.bp b/test/022-interface/Android.bp index 53a9b27c8a..ea8648dcdb 100644 --- a/test/022-interface/Android.bp +++ b/test/022-interface/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-022-interface", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-022-interface-expected"], } diff --git a/test/025-access-controller/Android.bp b/test/025-access-controller/Android.bp index bc332b775d..aca7ccf087 100644 --- a/test/025-access-controller/Android.bp +++ b/test/025-access-controller/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-025-access-controller", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-025-access-controller-expected"], } diff --git a/test/026-access/Android.bp b/test/026-access/Android.bp index 494f518653..ae74b13a74 100644 --- a/test/026-access/Android.bp +++ b/test/026-access/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-026-access", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-026-access-expected"], } diff --git a/test/027-arithmetic/Android.bp b/test/027-arithmetic/Android.bp index 1489fc93f7..ddf456a32e 100644 --- a/test/027-arithmetic/Android.bp +++ b/test/027-arithmetic/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-027-arithmetic", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-027-arithmetic-expected"], } diff --git a/test/028-array-write/Android.bp b/test/028-array-write/Android.bp index 91db917aed..9417f40f6f 100644 --- a/test/028-array-write/Android.bp +++ b/test/028-array-write/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-028-array-write", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-028-array-write-expected"], } diff --git a/test/029-assert/Android.bp b/test/029-assert/Android.bp index b0eb6b5f99..05090bf062 100644 --- a/test/029-assert/Android.bp +++ b/test/029-assert/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-029-assert", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-029-assert-expected"], } diff --git a/test/030-bad-finalizer/Android.bp b/test/030-bad-finalizer/Android.bp index ed6bce539c..f032e51bd5 100644 --- a/test/030-bad-finalizer/Android.bp +++ b/test/030-bad-finalizer/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-030-bad-finalizer", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-030-bad-finalizer-expected"], } diff --git a/test/033-class-init-deadlock/Android.bp b/test/033-class-init-deadlock/Android.bp index 2ad09c8fca..0b6b4102cc 100644 --- a/test/033-class-init-deadlock/Android.bp +++ b/test/033-class-init-deadlock/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-033-class-init-deadlock", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-033-class-init-deadlock-expected"], } diff --git a/test/034-call-null/Android.bp b/test/034-call-null/Android.bp index 272e6bad16..bf87771a06 100644 --- a/test/034-call-null/Android.bp +++ b/test/034-call-null/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-034-call-null", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-034-call-null-expected"], } diff --git a/test/035-enum/Android.bp b/test/035-enum/Android.bp index d23012db7c..9ed399968e 100644 --- a/test/035-enum/Android.bp +++ b/test/035-enum/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-035-enum", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-035-enum-expected"], } diff --git a/test/036-finalizer/Android.bp b/test/036-finalizer/Android.bp index ccf3de3bfe..5586453201 100644 --- a/test/036-finalizer/Android.bp +++ b/test/036-finalizer/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-036-finalizer", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-036-finalizer-expected"], } diff --git a/test/037-inherit/Android.bp b/test/037-inherit/Android.bp index e193c5b2c4..9aebf4454a 100644 --- a/test/037-inherit/Android.bp +++ b/test/037-inherit/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-037-inherit", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-037-inherit-expected"], } diff --git a/test/038-inner-null/Android.bp b/test/038-inner-null/Android.bp index 2d84c31f06..293426cffb 100644 --- a/test/038-inner-null/Android.bp +++ b/test/038-inner-null/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-038-inner-null", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-038-inner-null-expected"], } diff --git a/test/039-join-main/Android.bp b/test/039-join-main/Android.bp index 5e63a033fa..8af6335ba0 100644 --- a/test/039-join-main/Android.bp +++ b/test/039-join-main/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-039-join-main", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-039-join-main-expected"], } diff --git a/test/040-miranda/Android.bp b/test/040-miranda/Android.bp index 61bfe8a488..633568294d 100644 --- a/test/040-miranda/Android.bp +++ b/test/040-miranda/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-040-miranda", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-040-miranda-expected"], } diff --git a/test/041-narrowing/Android.bp b/test/041-narrowing/Android.bp index fc38c156ef..ee249a71c2 100644 --- a/test/041-narrowing/Android.bp +++ b/test/041-narrowing/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-041-narrowing", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-041-narrowing-expected"], } diff --git a/test/043-privates/Android.bp b/test/043-privates/Android.bp index 8f9ddd9c38..dd5802dae1 100644 --- a/test/043-privates/Android.bp +++ b/test/043-privates/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-043-privates", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-043-privates-expected"], } diff --git a/test/044-proxy/Android.bp b/test/044-proxy/Android.bp index 2cd53b0bec..b862e889a9 100644 --- a/test/044-proxy/Android.bp +++ b/test/044-proxy/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-044-proxy", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-044-proxy-expected"], } diff --git a/test/045-reflect-array/Android.bp b/test/045-reflect-array/Android.bp index d0cce72706..9475745b6f 100644 --- a/test/045-reflect-array/Android.bp +++ b/test/045-reflect-array/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-045-reflect-array", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-045-reflect-array-expected"], } diff --git a/test/046-reflect/Android.bp b/test/046-reflect/Android.bp index 253648d610..56a0591147 100644 --- a/test/046-reflect/Android.bp +++ b/test/046-reflect/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-046-reflect", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-046-reflect-expected"], } diff --git a/test/047-returns/Android.bp b/test/047-returns/Android.bp index 1c37e5bd97..d9070770f3 100644 --- a/test/047-returns/Android.bp +++ b/test/047-returns/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-047-returns", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-047-returns-expected"], } diff --git a/test/048-reflect-v8/Android.bp b/test/048-reflect-v8/Android.bp index d6183d534c..a5737a8908 100644 --- a/test/048-reflect-v8/Android.bp +++ b/test/048-reflect-v8/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-048-reflect-v8", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-048-reflect-v8-expected"], } diff --git a/test/049-show-object/Android.bp b/test/049-show-object/Android.bp index 103fd028cd..219a5563eb 100644 --- a/test/049-show-object/Android.bp +++ b/test/049-show-object/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-049-show-object", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-049-show-object-expected"], } diff --git a/test/050-sync-test/Android.bp b/test/050-sync-test/Android.bp index 2752ec8d0d..e6834465b5 100644 --- a/test/050-sync-test/Android.bp +++ b/test/050-sync-test/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-050-sync-test", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-050-sync-test-expected"], } diff --git a/test/051-thread/Android.bp b/test/051-thread/Android.bp index a47b0da73b..e974c2761f 100644 --- a/test/051-thread/Android.bp +++ b/test/051-thread/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-051-thread", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-051-thread-expected"], } diff --git a/test/052-verifier-fun/Android.bp b/test/052-verifier-fun/Android.bp index 545d0aa7c7..e8c2e1eafb 100644 --- a/test/052-verifier-fun/Android.bp +++ b/test/052-verifier-fun/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-052-verifier-fun", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-052-verifier-fun-expected"], } diff --git a/test/053-wait-some/Android.bp b/test/053-wait-some/Android.bp index 11e44e9604..8f3f3a5e85 100644 --- a/test/053-wait-some/Android.bp +++ b/test/053-wait-some/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-053-wait-some", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-053-wait-some-expected"], } diff --git a/test/054-uncaught/Android.bp b/test/054-uncaught/Android.bp index 9e10f237d7..82bacdff61 100644 --- a/test/054-uncaught/Android.bp +++ b/test/054-uncaught/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-054-uncaught", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-054-uncaught-expected"], } diff --git a/test/055-enum-performance/Android.bp b/test/055-enum-performance/Android.bp index d4322a49c2..b17a32107c 100644 --- a/test/055-enum-performance/Android.bp +++ b/test/055-enum-performance/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-055-enum-performance", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-055-enum-performance-expected"], } diff --git a/test/058-enum-order/Android.bp b/test/058-enum-order/Android.bp index 4b749eeb70..1d1f14fc48 100644 --- a/test/058-enum-order/Android.bp +++ b/test/058-enum-order/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-058-enum-order", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-058-enum-order-expected"], } diff --git a/test/059-finalizer-throw/Android.bp b/test/059-finalizer-throw/Android.bp index d573fbeca9..bba058c7b8 100644 --- a/test/059-finalizer-throw/Android.bp +++ b/test/059-finalizer-throw/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-059-finalizer-throw", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-059-finalizer-throw-expected"], } diff --git a/test/061-out-of-memory/Android.bp b/test/061-out-of-memory/Android.bp index 9858b1e23b..85979917f7 100644 --- a/test/061-out-of-memory/Android.bp +++ b/test/061-out-of-memory/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-061-out-of-memory", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-061-out-of-memory-expected"], } diff --git a/test/062-character-encodings/Android.bp b/test/062-character-encodings/Android.bp index b0ba862a0d..efc2df8010 100644 --- a/test/062-character-encodings/Android.bp +++ b/test/062-character-encodings/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-062-character-encodings", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-062-character-encodings-expected"], } diff --git a/test/063-process-manager/Android.bp b/test/063-process-manager/Android.bp index b287dad0b7..339515b22c 100644 --- a/test/063-process-manager/Android.bp +++ b/test/063-process-manager/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-063-process-manager", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-063-process-manager-expected"], } diff --git a/test/067-preemptive-unpark/Android.bp b/test/067-preemptive-unpark/Android.bp index de2a274939..39247c6e5d 100644 --- a/test/067-preemptive-unpark/Android.bp +++ b/test/067-preemptive-unpark/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-067-preemptive-unpark", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-067-preemptive-unpark-expected"], } diff --git a/test/070-nio-buffer/Android.bp b/test/070-nio-buffer/Android.bp index 4f355ac804..ceaf3cbce7 100644 --- a/test/070-nio-buffer/Android.bp +++ b/test/070-nio-buffer/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-070-nio-buffer", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-070-nio-buffer-expected"], } diff --git a/test/072-precise-gc/Android.bp b/test/072-precise-gc/Android.bp index 91762cab36..2bd33c947b 100644 --- a/test/072-precise-gc/Android.bp +++ b/test/072-precise-gc/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-072-precise-gc", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-072-precise-gc-expected"], } diff --git a/test/072-reachability-fence/Android.bp b/test/072-reachability-fence/Android.bp index 26e952afa8..311653b9c7 100644 --- a/test/072-reachability-fence/Android.bp +++ b/test/072-reachability-fence/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-072-reachability-fence", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-072-reachability-fence-expected"], } diff --git a/test/074-gc-thrash/Android.bp b/test/074-gc-thrash/Android.bp index 9a2a552ecf..c7e601a1d6 100644 --- a/test/074-gc-thrash/Android.bp +++ b/test/074-gc-thrash/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-074-gc-thrash", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-074-gc-thrash-expected"], } diff --git a/test/076-boolean-put/Android.bp b/test/076-boolean-put/Android.bp index 67bf41f1e8..b74b5f2cbd 100644 --- a/test/076-boolean-put/Android.bp +++ b/test/076-boolean-put/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-076-boolean-put", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-076-boolean-put-expected"], } diff --git a/test/078-polymorphic-virtual/Android.bp b/test/078-polymorphic-virtual/Android.bp index bf84e8ab17..408b5c862a 100644 --- a/test/078-polymorphic-virtual/Android.bp +++ b/test/078-polymorphic-virtual/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-078-polymorphic-virtual", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-078-polymorphic-virtual-expected"], } diff --git a/test/079-phantom/Android.bp b/test/079-phantom/Android.bp index 960ab68df3..90a8b18760 100644 --- a/test/079-phantom/Android.bp +++ b/test/079-phantom/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-079-phantom", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-079-phantom-expected"], } diff --git a/test/080-oom-fragmentation/Android.bp b/test/080-oom-fragmentation/Android.bp index 85e4fb4e93..817bd98eca 100644 --- a/test/080-oom-fragmentation/Android.bp +++ b/test/080-oom-fragmentation/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-080-oom-fragmentation", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-080-oom-fragmentation-expected"], } diff --git a/test/080-oom-throw-with-finalizer/Android.bp b/test/080-oom-throw-with-finalizer/Android.bp index 2bb211128b..3a2474cbdd 100644 --- a/test/080-oom-throw-with-finalizer/Android.bp +++ b/test/080-oom-throw-with-finalizer/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-080-oom-throw-with-finalizer", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-080-oom-throw-with-finalizer-expected"], } diff --git a/test/080-oom-throw/Android.bp b/test/080-oom-throw/Android.bp index 1fd84ce140..ca5233d7a0 100644 --- a/test/080-oom-throw/Android.bp +++ b/test/080-oom-throw/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-080-oom-throw", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-080-oom-throw-expected"], } diff --git a/test/081-hot-exceptions/Android.bp b/test/081-hot-exceptions/Android.bp index 992d5f57c6..34c686db27 100644 --- a/test/081-hot-exceptions/Android.bp +++ b/test/081-hot-exceptions/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-081-hot-exceptions", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-081-hot-exceptions-expected"], } diff --git a/test/082-inline-execute/Android.bp b/test/082-inline-execute/Android.bp index e65314b803..3bead60699 100644 --- a/test/082-inline-execute/Android.bp +++ b/test/082-inline-execute/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-082-inline-execute", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-082-inline-execute-expected"], } diff --git a/test/083-compiler-regressions/Android.bp b/test/083-compiler-regressions/Android.bp index f1ccb9ade6..304693c6a7 100644 --- a/test/083-compiler-regressions/Android.bp +++ b/test/083-compiler-regressions/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-083-compiler-regressions", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-083-compiler-regressions-expected"], } diff --git a/test/084-class-init/Android.bp b/test/084-class-init/Android.bp index e4daee7ef1..867d775464 100644 --- a/test/084-class-init/Android.bp +++ b/test/084-class-init/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-084-class-init", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-084-class-init-expected"], } diff --git a/test/086-null-super/Android.bp b/test/086-null-super/Android.bp index 5cff6cd6f1..7ea03b4b04 100644 --- a/test/086-null-super/Android.bp +++ b/test/086-null-super/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-086-null-super", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-086-null-super-expected"], } diff --git a/test/087-gc-after-link/Android.bp b/test/087-gc-after-link/Android.bp index 6b827dd899..300e7960df 100644 --- a/test/087-gc-after-link/Android.bp +++ b/test/087-gc-after-link/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-087-gc-after-link", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-087-gc-after-link-expected"], } diff --git a/test/090-loop-formation/Android.bp b/test/090-loop-formation/Android.bp index bca7c608c6..e97fcd808e 100644 --- a/test/090-loop-formation/Android.bp +++ b/test/090-loop-formation/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-090-loop-formation", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-090-loop-formation-expected"], } diff --git a/test/092-locale/Android.bp b/test/092-locale/Android.bp index f610e7fad0..7a724067bf 100644 --- a/test/092-locale/Android.bp +++ b/test/092-locale/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-092-locale", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-092-locale-expected"], } diff --git a/test/093-serialization/Android.bp b/test/093-serialization/Android.bp index b65c508fe6..de0cf09556 100644 --- a/test/093-serialization/Android.bp +++ b/test/093-serialization/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-093-serialization", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-093-serialization-expected"], } diff --git a/test/094-pattern/Android.bp b/test/094-pattern/Android.bp index ade2916950..7a8feeae41 100644 --- a/test/094-pattern/Android.bp +++ b/test/094-pattern/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-094-pattern", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-094-pattern-expected"], } diff --git a/test/095-switch-MAX_INT/Android.bp b/test/095-switch-MAX_INT/Android.bp index deba27e1f2..ead51fb9b0 100644 --- a/test/095-switch-MAX_INT/Android.bp +++ b/test/095-switch-MAX_INT/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-095-switch-MAX_INT", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-095-switch-MAX_INT-expected"], } diff --git a/test/096-array-copy-concurrent-gc/Android.bp b/test/096-array-copy-concurrent-gc/Android.bp index 6164d0c662..5024ce9455 100644 --- a/test/096-array-copy-concurrent-gc/Android.bp +++ b/test/096-array-copy-concurrent-gc/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-096-array-copy-concurrent-gc", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-096-array-copy-concurrent-gc-expected"], } diff --git a/test/098-ddmc/Android.bp b/test/098-ddmc/Android.bp index 8abc8af553..6ed9298322 100644 --- a/test/098-ddmc/Android.bp +++ b/test/098-ddmc/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-098-ddmc", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-098-ddmc-expected"], } diff --git a/test/099-vmdebug/Android.bp b/test/099-vmdebug/Android.bp index cca3cc1f9c..7ecd5a6e1b 100644 --- a/test/099-vmdebug/Android.bp +++ b/test/099-vmdebug/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-099-vmdebug", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-099-vmdebug-expected"], } diff --git a/test/100-reflect2/Android.bp b/test/100-reflect2/Android.bp index cf1a92a8df..cecc377d2b 100644 --- a/test/100-reflect2/Android.bp +++ b/test/100-reflect2/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-100-reflect2", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-100-reflect2-expected"], } diff --git a/test/1004-checker-volatile-ref-load/Android.bp b/test/1004-checker-volatile-ref-load/Android.bp index 50ab9b8deb..f24a64b914 100644 --- a/test/1004-checker-volatile-ref-load/Android.bp +++ b/test/1004-checker-volatile-ref-load/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-1004-checker-volatile-ref-load-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/101-fibonacci/Android.bp b/test/101-fibonacci/Android.bp index bef68135ff..e1185c1866 100644 --- a/test/101-fibonacci/Android.bp +++ b/test/101-fibonacci/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-101-fibonacci", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-101-fibonacci-expected"], } diff --git a/test/102-concurrent-gc/Android.bp b/test/102-concurrent-gc/Android.bp index 60640e0f31..883465a404 100644 --- a/test/102-concurrent-gc/Android.bp +++ b/test/102-concurrent-gc/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-102-concurrent-gc", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-102-concurrent-gc-expected"], } diff --git a/test/103-string-append/Android.bp b/test/103-string-append/Android.bp index d8d21fea3e..a1155e4efd 100644 --- a/test/103-string-append/Android.bp +++ b/test/103-string-append/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-103-string-append", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-103-string-append-expected"], } diff --git a/test/104-growth-limit/Android.bp b/test/104-growth-limit/Android.bp index 9c6dcad846..04f31f1445 100644 --- a/test/104-growth-limit/Android.bp +++ b/test/104-growth-limit/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-104-growth-limit", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-104-growth-limit-expected"], } diff --git a/test/105-invoke/Android.bp b/test/105-invoke/Android.bp index 04944bc726..19776094e1 100644 --- a/test/105-invoke/Android.bp +++ b/test/105-invoke/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-105-invoke", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-105-invoke-expected"], } diff --git a/test/106-exceptions2/Android.bp b/test/106-exceptions2/Android.bp index d1dfb5763f..3b3722ab22 100644 --- a/test/106-exceptions2/Android.bp +++ b/test/106-exceptions2/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-106-exceptions2", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-106-exceptions2-expected"], } diff --git a/test/107-int-math2/Android.bp b/test/107-int-math2/Android.bp index 417f29415a..6ec7727a2f 100644 --- a/test/107-int-math2/Android.bp +++ b/test/107-int-math2/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-107-int-math2", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-107-int-math2-expected"], } diff --git a/test/108-check-cast/Android.bp b/test/108-check-cast/Android.bp index 2a533b5f35..1b4d3b9e53 100644 --- a/test/108-check-cast/Android.bp +++ b/test/108-check-cast/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-108-check-cast", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-108-check-cast-expected"], } diff --git a/test/109-suspend-check/Android.bp b/test/109-suspend-check/Android.bp index 79d680bc90..5e74db78d0 100644 --- a/test/109-suspend-check/Android.bp +++ b/test/109-suspend-check/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-109-suspend-check", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-109-suspend-check-expected"], } diff --git a/test/110-field-access/Android.bp b/test/110-field-access/Android.bp index 209a934a10..5b857a5e10 100644 --- a/test/110-field-access/Android.bp +++ b/test/110-field-access/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-110-field-access", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-110-field-access-expected"], } diff --git a/test/112-double-math/Android.bp b/test/112-double-math/Android.bp index e979551e36..e0f6b26144 100644 --- a/test/112-double-math/Android.bp +++ b/test/112-double-math/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-112-double-math", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-112-double-math-expected"], } diff --git a/test/114-ParallelGC/Android.bp b/test/114-ParallelGC/Android.bp index cddeb03224..21ced76eb8 100644 --- a/test/114-ParallelGC/Android.bp +++ b/test/114-ParallelGC/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-114-ParallelGC", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-114-ParallelGC-expected"], } diff --git a/test/115-native-bridge/Android.bp b/test/115-native-bridge/Android.bp index 9444afc142..fdc9cf361a 100644 --- a/test/115-native-bridge/Android.bp +++ b/test/115-native-bridge/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-115-native-bridge", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-115-native-bridge-expected"], } diff --git a/test/116-nodex2oat/Android.bp b/test/116-nodex2oat/Android.bp index 262d12d77c..e2a6ba7c6e 100644 --- a/test/116-nodex2oat/Android.bp +++ b/test/116-nodex2oat/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-116-nodex2oat", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-116-nodex2oat-expected"], } diff --git a/test/120-hashcode/Android.bp b/test/120-hashcode/Android.bp index 73c9d6ab60..7e60b8e424 100644 --- a/test/120-hashcode/Android.bp +++ b/test/120-hashcode/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-120-hashcode", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-120-hashcode-expected"], } diff --git a/test/121-simple-suspend-check/Android.bp b/test/121-simple-suspend-check/Android.bp index d31deb215c..bf25234171 100644 --- a/test/121-simple-suspend-check/Android.bp +++ b/test/121-simple-suspend-check/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-121-simple-suspend-check", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-121-simple-suspend-check-expected"], } diff --git a/test/122-npe/Android.bp b/test/122-npe/Android.bp index aca030c3dd..1db729cbdf 100644 --- a/test/122-npe/Android.bp +++ b/test/122-npe/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-122-npe", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-122-npe-expected"], } diff --git a/test/123-compiler-regressions-mt/Android.bp b/test/123-compiler-regressions-mt/Android.bp index 80e3a52453..088b30081e 100644 --- a/test/123-compiler-regressions-mt/Android.bp +++ b/test/123-compiler-regressions-mt/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-123-compiler-regressions-mt", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-123-compiler-regressions-mt-expected"], } diff --git a/test/123-inline-execute2/Android.bp b/test/123-inline-execute2/Android.bp index 0220cc1c44..bb084f2f6d 100644 --- a/test/123-inline-execute2/Android.bp +++ b/test/123-inline-execute2/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-123-inline-execute2", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-123-inline-execute2-expected"], } diff --git a/test/125-gc-and-classloading/Android.bp b/test/125-gc-and-classloading/Android.bp index f6e273e82e..fedc5b8283 100644 --- a/test/125-gc-and-classloading/Android.bp +++ b/test/125-gc-and-classloading/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-125-gc-and-classloading", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-125-gc-and-classloading-expected"], } diff --git a/test/128-reg-spill-on-implicit-nullcheck/Android.bp b/test/128-reg-spill-on-implicit-nullcheck/Android.bp index 646bd36ba3..607b627562 100644 --- a/test/128-reg-spill-on-implicit-nullcheck/Android.bp +++ b/test/128-reg-spill-on-implicit-nullcheck/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-128-reg-spill-on-implicit-nullcheck", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-128-reg-spill-on-implicit-nullcheck-expected"], } diff --git a/test/129-ThreadGetId/Android.bp b/test/129-ThreadGetId/Android.bp index cb11a3601a..19e25c24cc 100644 --- a/test/129-ThreadGetId/Android.bp +++ b/test/129-ThreadGetId/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-129-ThreadGetId", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-129-ThreadGetId-expected"], } diff --git a/test/132-daemon-locks-shutdown/Android.bp b/test/132-daemon-locks-shutdown/Android.bp index d281024cf8..d869591ae7 100644 --- a/test/132-daemon-locks-shutdown/Android.bp +++ b/test/132-daemon-locks-shutdown/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-132-daemon-locks-shutdown", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-132-daemon-locks-shutdown-expected"], } diff --git a/test/133-static-invoke-super/Android.bp b/test/133-static-invoke-super/Android.bp index 511a38baf3..75717fff33 100644 --- a/test/133-static-invoke-super/Android.bp +++ b/test/133-static-invoke-super/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-133-static-invoke-super", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-133-static-invoke-super-expected"], } diff --git a/test/1336-short-finalizer-timeout/Android.bp b/test/1336-short-finalizer-timeout/Android.bp index 3387cabba8..6ea9e05d0b 100644 --- a/test/1336-short-finalizer-timeout/Android.bp +++ b/test/1336-short-finalizer-timeout/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1336-short-finalizer-timeout", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1336-short-finalizer-timeout-expected"], } diff --git a/test/1337-gc-coverage/Android.bp b/test/1337-gc-coverage/Android.bp index 6dee596a91..06f3267a97 100644 --- a/test/1337-gc-coverage/Android.bp +++ b/test/1337-gc-coverage/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1337-gc-coverage", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1337-gc-coverage-expected"], } diff --git a/test/1339-dead-reference-safe/Android.bp b/test/1339-dead-reference-safe/Android.bp index 9a2ca722c6..f4c14fa87e 100644 --- a/test/1339-dead-reference-safe/Android.bp +++ b/test/1339-dead-reference-safe/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1339-dead-reference-safe", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1339-dead-reference-safe-expected"], } diff --git a/test/136-daemon-jni-shutdown/Android.bp b/test/136-daemon-jni-shutdown/Android.bp index 6741460379..03c923187c 100644 --- a/test/136-daemon-jni-shutdown/Android.bp +++ b/test/136-daemon-jni-shutdown/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-136-daemon-jni-shutdown", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-136-daemon-jni-shutdown-expected"], } diff --git a/test/139-register-natives/Android.bp b/test/139-register-natives/Android.bp index 15ad83b7fc..b1fc5b82be 100644 --- a/test/139-register-natives/Android.bp +++ b/test/139-register-natives/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-139-register-natives", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-139-register-natives-expected"], } diff --git a/test/140-dce-regression/Android.bp b/test/140-dce-regression/Android.bp index e94bad6e1b..1e90f5a7fc 100644 --- a/test/140-dce-regression/Android.bp +++ b/test/140-dce-regression/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-140-dce-regression", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-140-dce-regression-expected"], } diff --git a/test/140-field-packing/Android.bp b/test/140-field-packing/Android.bp index baa9c0ea03..25714109f8 100644 --- a/test/140-field-packing/Android.bp +++ b/test/140-field-packing/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-140-field-packing", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-140-field-packing-expected"], } diff --git a/test/143-string-value/Android.bp b/test/143-string-value/Android.bp index 6d0b74635b..548be9c05c 100644 --- a/test/143-string-value/Android.bp +++ b/test/143-string-value/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-143-string-value", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-143-string-value-expected"], } diff --git a/test/144-static-field-sigquit/Android.bp b/test/144-static-field-sigquit/Android.bp index e52efe8488..d92ad363c9 100644 --- a/test/144-static-field-sigquit/Android.bp +++ b/test/144-static-field-sigquit/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-144-static-field-sigquit", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-144-static-field-sigquit-expected"], } diff --git a/test/148-multithread-gc-annotations/Android.bp b/test/148-multithread-gc-annotations/Android.bp index c27800ae41..c54e9d365b 100644 --- a/test/148-multithread-gc-annotations/Android.bp +++ b/test/148-multithread-gc-annotations/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-148-multithread-gc-annotations", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-148-multithread-gc-annotations-expected"], } diff --git a/test/149-suspend-all-stress/Android.bp b/test/149-suspend-all-stress/Android.bp index 980cc6b85e..b5077c7331 100644 --- a/test/149-suspend-all-stress/Android.bp +++ b/test/149-suspend-all-stress/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-149-suspend-all-stress", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-149-suspend-all-stress-expected"], } diff --git a/test/150-loadlibrary/Android.bp b/test/150-loadlibrary/Android.bp index 257e8dc6c8..feb71aa214 100644 --- a/test/150-loadlibrary/Android.bp +++ b/test/150-loadlibrary/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-150-loadlibrary", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-150-loadlibrary-expected"], } diff --git a/test/151-OpenFileLimit/Android.bp b/test/151-OpenFileLimit/Android.bp index 8c822f3c80..fa9caf9ae0 100644 --- a/test/151-OpenFileLimit/Android.bp +++ b/test/151-OpenFileLimit/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-151-OpenFileLimit", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-151-OpenFileLimit-expected"], } diff --git a/test/152-dead-large-object/Android.bp b/test/152-dead-large-object/Android.bp index 3271e3cce9..fa030eab1d 100644 --- a/test/152-dead-large-object/Android.bp +++ b/test/152-dead-large-object/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-152-dead-large-object", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-152-dead-large-object-expected"], } diff --git a/test/153-reference-stress/Android.bp b/test/153-reference-stress/Android.bp index 0a563f4fb2..cdc0dd2153 100644 --- a/test/153-reference-stress/Android.bp +++ b/test/153-reference-stress/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-153-reference-stress", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-153-reference-stress-expected"], } diff --git a/test/154-gc-loop/Android.bp b/test/154-gc-loop/Android.bp index 992e2d8e24..e0f5955fd5 100644 --- a/test/154-gc-loop/Android.bp +++ b/test/154-gc-loop/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-154-gc-loop", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-154-gc-loop-expected"], } diff --git a/test/156-register-dex-file-multi-loader/Android.bp b/test/156-register-dex-file-multi-loader/Android.bp index 2a79255ac0..2ccebee7a1 100644 --- a/test/156-register-dex-file-multi-loader/Android.bp +++ b/test/156-register-dex-file-multi-loader/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-156-register-dex-file-multi-loader", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-156-register-dex-file-multi-loader-expected"], } diff --git a/test/158-app-image-class-table/Android.bp b/test/158-app-image-class-table/Android.bp index 52b9217ad3..a6bedba1ac 100644 --- a/test/158-app-image-class-table/Android.bp +++ b/test/158-app-image-class-table/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-158-app-image-class-table", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-158-app-image-class-table-expected"], } diff --git a/test/159-app-image-fields/Android.bp b/test/159-app-image-fields/Android.bp index 7b9638ea21..471854caed 100644 --- a/test/159-app-image-fields/Android.bp +++ b/test/159-app-image-fields/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-159-app-image-fields", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-159-app-image-fields-expected"], } diff --git a/test/160-read-barrier-stress/Android.bp b/test/160-read-barrier-stress/Android.bp index c8438da401..c83dd9322e 100644 --- a/test/160-read-barrier-stress/Android.bp +++ b/test/160-read-barrier-stress/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-160-read-barrier-stress", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-160-read-barrier-stress-expected"], } diff --git a/test/163-app-image-methods/Android.bp b/test/163-app-image-methods/Android.bp index 698ab6605c..bc3676a1ac 100644 --- a/test/163-app-image-methods/Android.bp +++ b/test/163-app-image-methods/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-163-app-image-methods", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-163-app-image-methods-expected"], } diff --git a/test/165-lock-owner-proxy/Android.bp b/test/165-lock-owner-proxy/Android.bp index 170268f227..4a12cfd635 100644 --- a/test/165-lock-owner-proxy/Android.bp +++ b/test/165-lock-owner-proxy/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-165-lock-owner-proxy", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-165-lock-owner-proxy-expected"], } diff --git a/test/168-vmstack-annotated/Android.bp b/test/168-vmstack-annotated/Android.bp index 8715e560d1..6353961282 100644 --- a/test/168-vmstack-annotated/Android.bp +++ b/test/168-vmstack-annotated/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-168-vmstack-annotated", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-168-vmstack-annotated-expected"], } diff --git a/test/169-threadgroup-jni/Android.bp b/test/169-threadgroup-jni/Android.bp index 4904eb97ac..7a82116b3f 100644 --- a/test/169-threadgroup-jni/Android.bp +++ b/test/169-threadgroup-jni/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-169-threadgroup-jni", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-169-threadgroup-jni-expected"], } diff --git a/test/170-interface-init/Android.bp b/test/170-interface-init/Android.bp index 51438a8730..f9b6b51d07 100644 --- a/test/170-interface-init/Android.bp +++ b/test/170-interface-init/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-170-interface-init", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-170-interface-init-expected"], } diff --git a/test/172-app-image-twice/Android.bp b/test/172-app-image-twice/Android.bp index a1481a4851..5989be1250 100644 --- a/test/172-app-image-twice/Android.bp +++ b/test/172-app-image-twice/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-172-app-image-twice", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-172-app-image-twice-expected"], } diff --git a/test/174-escaping-instance-of-bad-class/Android.bp b/test/174-escaping-instance-of-bad-class/Android.bp index 9abb4dd201..71826d8d4d 100644 --- a/test/174-escaping-instance-of-bad-class/Android.bp +++ b/test/174-escaping-instance-of-bad-class/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-174-escaping-instance-of-bad-class", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-174-escaping-instance-of-bad-class-expected"], } diff --git a/test/175-alloc-big-bignums/Android.bp b/test/175-alloc-big-bignums/Android.bp index 7f58a275b5..7284fc70cd 100644 --- a/test/175-alloc-big-bignums/Android.bp +++ b/test/175-alloc-big-bignums/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-175-alloc-big-bignums", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-175-alloc-big-bignums-expected"], } diff --git a/test/176-app-image-string/Android.bp b/test/176-app-image-string/Android.bp index af7ffd27f2..5e6185cf04 100644 --- a/test/176-app-image-string/Android.bp +++ b/test/176-app-image-string/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-176-app-image-string", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-176-app-image-string-expected"], } diff --git a/test/177-visibly-initialized-deadlock/Android.bp b/test/177-visibly-initialized-deadlock/Android.bp index c63b4ace76..0ee52c099d 100644 --- a/test/177-visibly-initialized-deadlock/Android.bp +++ b/test/177-visibly-initialized-deadlock/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-177-visibly-initialized-deadlock", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-177-visibly-initialized-deadlock-expected"], } diff --git a/test/178-app-image-native-method/Android.bp b/test/178-app-image-native-method/Android.bp index dbe97cc43f..58ffea3af8 100644 --- a/test/178-app-image-native-method/Android.bp +++ b/test/178-app-image-native-method/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-178-app-image-native-method", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-178-app-image-native-method-expected"], } diff --git a/test/179-nonvirtual-jni/Android.bp b/test/179-nonvirtual-jni/Android.bp index d43a52df36..a3f8c7e895 100644 --- a/test/179-nonvirtual-jni/Android.bp +++ b/test/179-nonvirtual-jni/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-179-nonvirtual-jni", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-179-nonvirtual-jni-expected"], } diff --git a/test/1900-track-alloc/Android.bp b/test/1900-track-alloc/Android.bp index 1185287a39..866e76b6ce 100644 --- a/test/1900-track-alloc/Android.bp +++ b/test/1900-track-alloc/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1900-track-alloc", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1900-track-alloc-expected"], } diff --git a/test/1901-get-bytecodes/Android.bp b/test/1901-get-bytecodes/Android.bp index 962f3a7ad9..fa3c57e1b6 100644 --- a/test/1901-get-bytecodes/Android.bp +++ b/test/1901-get-bytecodes/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1901-get-bytecodes", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1901-get-bytecodes-expected"], } diff --git a/test/1902-suspend/Android.bp b/test/1902-suspend/Android.bp index d24e1ac2ce..987bc24b2c 100644 --- a/test/1902-suspend/Android.bp +++ b/test/1902-suspend/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1902-suspend", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1902-suspend-expected"], } diff --git a/test/1903-suspend-self/Android.bp b/test/1903-suspend-self/Android.bp index fa5e06ad3c..67ca9b4459 100644 --- a/test/1903-suspend-self/Android.bp +++ b/test/1903-suspend-self/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1903-suspend-self", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1903-suspend-self-expected"], } diff --git a/test/1904-double-suspend/Android.bp b/test/1904-double-suspend/Android.bp index fd1012453f..44b8b8698b 100644 --- a/test/1904-double-suspend/Android.bp +++ b/test/1904-double-suspend/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1904-double-suspend", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1904-double-suspend-expected"], } diff --git a/test/1905-suspend-native/Android.bp b/test/1905-suspend-native/Android.bp index 589dd3a3de..35a7a5e7ae 100644 --- a/test/1905-suspend-native/Android.bp +++ b/test/1905-suspend-native/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1905-suspend-native", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1905-suspend-native-expected"], } diff --git a/test/1906-suspend-list-me-first/Android.bp b/test/1906-suspend-list-me-first/Android.bp index a39e8f34f5..a900ca8261 100644 --- a/test/1906-suspend-list-me-first/Android.bp +++ b/test/1906-suspend-list-me-first/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1906-suspend-list-me-first", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1906-suspend-list-me-first-expected"], } diff --git a/test/1907-suspend-list-self-twice/Android.bp b/test/1907-suspend-list-self-twice/Android.bp index 5628bd6150..8ef235f898 100644 --- a/test/1907-suspend-list-self-twice/Android.bp +++ b/test/1907-suspend-list-self-twice/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1907-suspend-list-self-twice", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1907-suspend-list-self-twice-expected"], } diff --git a/test/1908-suspend-native-resume-self/Android.bp b/test/1908-suspend-native-resume-self/Android.bp index 7aa6b9c17a..845872d11d 100644 --- a/test/1908-suspend-native-resume-self/Android.bp +++ b/test/1908-suspend-native-resume-self/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1908-suspend-native-resume-self", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1908-suspend-native-resume-self-expected"], } diff --git a/test/1909-per-agent-tls/Android.bp b/test/1909-per-agent-tls/Android.bp index 2bd51a851a..603db802da 100644 --- a/test/1909-per-agent-tls/Android.bp +++ b/test/1909-per-agent-tls/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1909-per-agent-tls", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1909-per-agent-tls-expected"], } diff --git a/test/1910-transform-with-default/Android.bp b/test/1910-transform-with-default/Android.bp index b4945d60d3..9746611304 100644 --- a/test/1910-transform-with-default/Android.bp +++ b/test/1910-transform-with-default/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1910-transform-with-default", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1910-transform-with-default-expected"], } diff --git a/test/1911-get-local-var-table/Android.bp b/test/1911-get-local-var-table/Android.bp index b89695e45e..7694b281f6 100644 --- a/test/1911-get-local-var-table/Android.bp +++ b/test/1911-get-local-var-table/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1911-get-local-var-table", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1911-get-local-var-table-expected"], } diff --git a/test/1912-get-set-local-primitive/Android.bp b/test/1912-get-set-local-primitive/Android.bp index c8e2f91c27..7155d439df 100644 --- a/test/1912-get-set-local-primitive/Android.bp +++ b/test/1912-get-set-local-primitive/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1912-get-set-local-primitive", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1912-get-set-local-primitive-expected"], } diff --git a/test/1913-get-set-local-objects/Android.bp b/test/1913-get-set-local-objects/Android.bp index a54ff418ac..7df00e2512 100644 --- a/test/1913-get-set-local-objects/Android.bp +++ b/test/1913-get-set-local-objects/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1913-get-set-local-objects", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1913-get-set-local-objects-expected"], } diff --git a/test/1914-get-local-instance/Android.bp b/test/1914-get-local-instance/Android.bp index a34c5e8e6c..361dac5a5e 100644 --- a/test/1914-get-local-instance/Android.bp +++ b/test/1914-get-local-instance/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1914-get-local-instance", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1914-get-local-instance-expected"], } diff --git a/test/1915-get-set-local-current-thread/Android.bp b/test/1915-get-set-local-current-thread/Android.bp index 0590283c4b..c93992c373 100644 --- a/test/1915-get-set-local-current-thread/Android.bp +++ b/test/1915-get-set-local-current-thread/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1915-get-set-local-current-thread", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1915-get-set-local-current-thread-expected"], } diff --git a/test/1916-get-set-current-frame/Android.bp b/test/1916-get-set-current-frame/Android.bp index 1b0dfca564..8536bcd575 100644 --- a/test/1916-get-set-current-frame/Android.bp +++ b/test/1916-get-set-current-frame/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1916-get-set-current-frame", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1916-get-set-current-frame-expected"], } diff --git a/test/1917-get-stack-frame/Android.bp b/test/1917-get-stack-frame/Android.bp index b6ab60a560..cecfff51e1 100644 --- a/test/1917-get-stack-frame/Android.bp +++ b/test/1917-get-stack-frame/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1917-get-stack-frame", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1917-get-stack-frame-expected"], } diff --git a/test/1919-vminit-thread-start-timing/Android.bp b/test/1919-vminit-thread-start-timing/Android.bp index d9c5deebf9..93f7c3c812 100644 --- a/test/1919-vminit-thread-start-timing/Android.bp +++ b/test/1919-vminit-thread-start-timing/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1919-vminit-thread-start-timing", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1919-vminit-thread-start-timing-expected"], } diff --git a/test/1920-suspend-native-monitor/Android.bp b/test/1920-suspend-native-monitor/Android.bp index dbbc674794..843124bfbd 100644 --- a/test/1920-suspend-native-monitor/Android.bp +++ b/test/1920-suspend-native-monitor/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1920-suspend-native-monitor", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1920-suspend-native-monitor-expected"], } diff --git a/test/1921-suspend-native-recursive-monitor/Android.bp b/test/1921-suspend-native-recursive-monitor/Android.bp index 02dadc8877..b31085fc15 100644 --- a/test/1921-suspend-native-recursive-monitor/Android.bp +++ b/test/1921-suspend-native-recursive-monitor/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1921-suspend-native-recursive-monitor", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1921-suspend-native-recursive-monitor-expected"], } diff --git a/test/1922-owned-monitors-info/Android.bp b/test/1922-owned-monitors-info/Android.bp index 7486413027..f0b9b84ce3 100644 --- a/test/1922-owned-monitors-info/Android.bp +++ b/test/1922-owned-monitors-info/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1922-owned-monitors-info", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1922-owned-monitors-info-expected"], } diff --git a/test/1923-frame-pop/Android.bp b/test/1923-frame-pop/Android.bp index 2ede0bae20..560eb1fa6b 100644 --- a/test/1923-frame-pop/Android.bp +++ b/test/1923-frame-pop/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1923-frame-pop", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1923-frame-pop-expected"], } diff --git a/test/1924-frame-pop-toggle/Android.bp b/test/1924-frame-pop-toggle/Android.bp index 553eeb8f0a..3e43f06cf9 100644 --- a/test/1924-frame-pop-toggle/Android.bp +++ b/test/1924-frame-pop-toggle/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1924-frame-pop-toggle", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1924-frame-pop-toggle-expected"], } diff --git a/test/1925-self-frame-pop/Android.bp b/test/1925-self-frame-pop/Android.bp index 1f9b951137..0bcdcf4bbb 100644 --- a/test/1925-self-frame-pop/Android.bp +++ b/test/1925-self-frame-pop/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1925-self-frame-pop", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1925-self-frame-pop-expected"], } diff --git a/test/1926-missed-frame-pop/Android.bp b/test/1926-missed-frame-pop/Android.bp index 979b10fb42..720c9efae7 100644 --- a/test/1926-missed-frame-pop/Android.bp +++ b/test/1926-missed-frame-pop/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1926-missed-frame-pop", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1926-missed-frame-pop-expected"], } diff --git a/test/1927-exception-event/Android.bp b/test/1927-exception-event/Android.bp index 39b269367b..4fe46ffc23 100644 --- a/test/1927-exception-event/Android.bp +++ b/test/1927-exception-event/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1927-exception-event", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1927-exception-event-expected"], } diff --git a/test/1928-exception-event-exception/Android.bp b/test/1928-exception-event-exception/Android.bp index dc61ee1655..88224b1656 100644 --- a/test/1928-exception-event-exception/Android.bp +++ b/test/1928-exception-event-exception/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1928-exception-event-exception", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1928-exception-event-exception-expected"], } diff --git a/test/1930-monitor-info/Android.bp b/test/1930-monitor-info/Android.bp index f6c61bebfa..32d5da3320 100644 --- a/test/1930-monitor-info/Android.bp +++ b/test/1930-monitor-info/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1930-monitor-info", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1930-monitor-info-expected"], } diff --git a/test/1931-monitor-events/Android.bp b/test/1931-monitor-events/Android.bp index f9abf58bb0..692a185eb5 100644 --- a/test/1931-monitor-events/Android.bp +++ b/test/1931-monitor-events/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1931-monitor-events", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1931-monitor-events-expected"], } diff --git a/test/1932-monitor-events-misc/Android.bp b/test/1932-monitor-events-misc/Android.bp index 64b2240de7..940e92a3c1 100644 --- a/test/1932-monitor-events-misc/Android.bp +++ b/test/1932-monitor-events-misc/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1932-monitor-events-misc", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1932-monitor-events-misc-expected"], } diff --git a/test/1933-monitor-current-contended/Android.bp b/test/1933-monitor-current-contended/Android.bp index 546c5dbdf7..19d881a20a 100644 --- a/test/1933-monitor-current-contended/Android.bp +++ b/test/1933-monitor-current-contended/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1933-monitor-current-contended", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1933-monitor-current-contended-expected"], } diff --git a/test/1934-jvmti-signal-thread/Android.bp b/test/1934-jvmti-signal-thread/Android.bp index aa7dcf1278..c1a73ea455 100644 --- a/test/1934-jvmti-signal-thread/Android.bp +++ b/test/1934-jvmti-signal-thread/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1934-jvmti-signal-thread", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1934-jvmti-signal-thread-expected"], } diff --git a/test/1935-get-set-current-frame-jit/Android.bp b/test/1935-get-set-current-frame-jit/Android.bp index 82b5abfccc..0f51baaa00 100644 --- a/test/1935-get-set-current-frame-jit/Android.bp +++ b/test/1935-get-set-current-frame-jit/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1935-get-set-current-frame-jit", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1935-get-set-current-frame-jit-expected"], } diff --git a/test/1936-thread-end-events/Android.bp b/test/1936-thread-end-events/Android.bp index 1ed86d5daf..53fd795a40 100644 --- a/test/1936-thread-end-events/Android.bp +++ b/test/1936-thread-end-events/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1936-thread-end-events", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1936-thread-end-events-expected"], } diff --git a/test/1937-transform-soft-fail/Android.bp b/test/1937-transform-soft-fail/Android.bp index f9e2e71b74..c9fb982085 100644 --- a/test/1937-transform-soft-fail/Android.bp +++ b/test/1937-transform-soft-fail/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1937-transform-soft-fail", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1937-transform-soft-fail-expected"], } diff --git a/test/1938-transform-abstract-single-impl/Android.bp b/test/1938-transform-abstract-single-impl/Android.bp index ed1049a3bb..0802186226 100644 --- a/test/1938-transform-abstract-single-impl/Android.bp +++ b/test/1938-transform-abstract-single-impl/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1938-transform-abstract-single-impl", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1938-transform-abstract-single-impl-expected"], } diff --git a/test/1939-proxy-frames/Android.bp b/test/1939-proxy-frames/Android.bp index 2c97f4e9c9..ff3d5cdc05 100644 --- a/test/1939-proxy-frames/Android.bp +++ b/test/1939-proxy-frames/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1939-proxy-frames", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1939-proxy-frames-expected"], } diff --git a/test/1941-dispose-stress/Android.bp b/test/1941-dispose-stress/Android.bp index 761c3c6ec5..ac6fb5c5a6 100644 --- a/test/1941-dispose-stress/Android.bp +++ b/test/1941-dispose-stress/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1941-dispose-stress", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1941-dispose-stress-expected"], } diff --git a/test/1942-suspend-raw-monitor-exit/Android.bp b/test/1942-suspend-raw-monitor-exit/Android.bp index 4adb9901bc..cf1886f340 100644 --- a/test/1942-suspend-raw-monitor-exit/Android.bp +++ b/test/1942-suspend-raw-monitor-exit/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1942-suspend-raw-monitor-exit", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1942-suspend-raw-monitor-exit-expected"], } diff --git a/test/1943-suspend-raw-monitor-wait/Android.bp b/test/1943-suspend-raw-monitor-wait/Android.bp index afdd436e40..1aa2636e57 100644 --- a/test/1943-suspend-raw-monitor-wait/Android.bp +++ b/test/1943-suspend-raw-monitor-wait/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1943-suspend-raw-monitor-wait", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1943-suspend-raw-monitor-wait-expected"], } diff --git a/test/1945-proxy-method-arguments/Android.bp b/test/1945-proxy-method-arguments/Android.bp index 28d4a6628f..b5db6d7515 100644 --- a/test/1945-proxy-method-arguments/Android.bp +++ b/test/1945-proxy-method-arguments/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1945-proxy-method-arguments", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1945-proxy-method-arguments-expected"], } diff --git a/test/1947-breakpoint-redefine-deopt/Android.bp b/test/1947-breakpoint-redefine-deopt/Android.bp index 6cade3f1e3..ce1eff91a0 100644 --- a/test/1947-breakpoint-redefine-deopt/Android.bp +++ b/test/1947-breakpoint-redefine-deopt/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1947-breakpoint-redefine-deopt", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1947-breakpoint-redefine-deopt-expected"], } diff --git a/test/1949-short-dex-file/Android.bp b/test/1949-short-dex-file/Android.bp index 587c1aad43..ca92e7332a 100644 --- a/test/1949-short-dex-file/Android.bp +++ b/test/1949-short-dex-file/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1949-short-dex-file", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1949-short-dex-file-expected"], } diff --git a/test/1951-monitor-enter-no-suspend/Android.bp b/test/1951-monitor-enter-no-suspend/Android.bp index 89f49cd167..a4b699c094 100644 --- a/test/1951-monitor-enter-no-suspend/Android.bp +++ b/test/1951-monitor-enter-no-suspend/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1951-monitor-enter-no-suspend", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1951-monitor-enter-no-suspend-expected"], } diff --git a/test/1953-pop-frame/Android.bp b/test/1953-pop-frame/Android.bp index 97ac5a762d..0110ff882c 100644 --- a/test/1953-pop-frame/Android.bp +++ b/test/1953-pop-frame/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1953-pop-frame", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1953-pop-frame-expected"], } diff --git a/test/1954-pop-frame-jit/Android.bp b/test/1954-pop-frame-jit/Android.bp index 1fd86180d8..06e2505a85 100644 --- a/test/1954-pop-frame-jit/Android.bp +++ b/test/1954-pop-frame-jit/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1954-pop-frame-jit", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1954-pop-frame-jit-expected"], } diff --git a/test/1955-pop-frame-jit-called/Android.bp b/test/1955-pop-frame-jit-called/Android.bp index a6d4764cd6..f862f69854 100644 --- a/test/1955-pop-frame-jit-called/Android.bp +++ b/test/1955-pop-frame-jit-called/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1955-pop-frame-jit-called", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1955-pop-frame-jit-called-expected"], } diff --git a/test/1956-pop-frame-jit-calling/Android.bp b/test/1956-pop-frame-jit-calling/Android.bp index d6fcba157d..9a967fa169 100644 --- a/test/1956-pop-frame-jit-calling/Android.bp +++ b/test/1956-pop-frame-jit-calling/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1956-pop-frame-jit-calling", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1956-pop-frame-jit-calling-expected"], } diff --git a/test/1957-error-ext/Android.bp b/test/1957-error-ext/Android.bp index 4c50666a4d..9b5394837f 100644 --- a/test/1957-error-ext/Android.bp +++ b/test/1957-error-ext/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1957-error-ext", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1957-error-ext-expected"], } diff --git a/test/1958-transform-try-jit/Android.bp b/test/1958-transform-try-jit/Android.bp index 8f66b5df3f..1653b94664 100644 --- a/test/1958-transform-try-jit/Android.bp +++ b/test/1958-transform-try-jit/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1958-transform-try-jit", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1958-transform-try-jit-expected"], } diff --git a/test/1959-redefine-object-instrument/Android.bp b/test/1959-redefine-object-instrument/Android.bp index be6d6f5a7d..db9ab8c110 100644 --- a/test/1959-redefine-object-instrument/Android.bp +++ b/test/1959-redefine-object-instrument/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1959-redefine-object-instrument", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1959-redefine-object-instrument-expected"], } diff --git a/test/1960-checker-bounds-codegen/Android.bp b/test/1960-checker-bounds-codegen/Android.bp index e576fb7e45..6e104f4a30 100644 --- a/test/1960-checker-bounds-codegen/Android.bp +++ b/test/1960-checker-bounds-codegen/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-1960-checker-bounds-codegen-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/1960-obsolete-jit-multithread-native/Android.bp b/test/1960-obsolete-jit-multithread-native/Android.bp index 1f01a2b4b2..27372c8695 100644 --- a/test/1960-obsolete-jit-multithread-native/Android.bp +++ b/test/1960-obsolete-jit-multithread-native/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1960-obsolete-jit-multithread-native", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1960-obsolete-jit-multithread-native-expected"], } diff --git a/test/1961-checker-loop-vectorizer/Android.bp b/test/1961-checker-loop-vectorizer/Android.bp index 8870ed2e99..2ad48616e7 100644 --- a/test/1961-checker-loop-vectorizer/Android.bp +++ b/test/1961-checker-loop-vectorizer/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-1961-checker-loop-vectorizer-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/1961-obsolete-jit-multithread/Android.bp b/test/1961-obsolete-jit-multithread/Android.bp index e051f8c82d..6d4767476e 100644 --- a/test/1961-obsolete-jit-multithread/Android.bp +++ b/test/1961-obsolete-jit-multithread/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1961-obsolete-jit-multithread", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1961-obsolete-jit-multithread-expected"], } diff --git a/test/1962-multi-thread-events/Android.bp b/test/1962-multi-thread-events/Android.bp index b87b966e8d..ed8f5e3193 100644 --- a/test/1962-multi-thread-events/Android.bp +++ b/test/1962-multi-thread-events/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1962-multi-thread-events", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1962-multi-thread-events-expected"], } diff --git a/test/1963-add-to-dex-classloader-in-memory/Android.bp b/test/1963-add-to-dex-classloader-in-memory/Android.bp index 535f057dba..bf915ed782 100644 --- a/test/1963-add-to-dex-classloader-in-memory/Android.bp +++ b/test/1963-add-to-dex-classloader-in-memory/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1963-add-to-dex-classloader-in-memory", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1963-add-to-dex-classloader-in-memory-expected"], } diff --git a/test/1967-get-set-local-bad-slot/Android.bp b/test/1967-get-set-local-bad-slot/Android.bp index 41dd4587b6..654b7e6214 100644 --- a/test/1967-get-set-local-bad-slot/Android.bp +++ b/test/1967-get-set-local-bad-slot/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1967-get-set-local-bad-slot", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1967-get-set-local-bad-slot-expected"], } diff --git a/test/1968-force-early-return/Android.bp b/test/1968-force-early-return/Android.bp index 6d28f4e2e8..0dcd0ae837 100644 --- a/test/1968-force-early-return/Android.bp +++ b/test/1968-force-early-return/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1968-force-early-return", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1968-force-early-return-expected"], } diff --git a/test/1969-force-early-return-void/Android.bp b/test/1969-force-early-return-void/Android.bp index f5c11460b3..7d5d40fac8 100644 --- a/test/1969-force-early-return-void/Android.bp +++ b/test/1969-force-early-return-void/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1969-force-early-return-void", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1969-force-early-return-void-expected"], } diff --git a/test/1970-force-early-return-long/Android.bp b/test/1970-force-early-return-long/Android.bp index 83dcbe9d66..754362ecbc 100644 --- a/test/1970-force-early-return-long/Android.bp +++ b/test/1970-force-early-return-long/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1970-force-early-return-long", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1970-force-early-return-long-expected"], } diff --git a/test/1971-multi-force-early-return/Android.bp b/test/1971-multi-force-early-return/Android.bp index 40631ea486..07e015d1bc 100644 --- a/test/1971-multi-force-early-return/Android.bp +++ b/test/1971-multi-force-early-return/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1971-multi-force-early-return", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1971-multi-force-early-return-expected"], } diff --git a/test/1972-jni-id-swap-indices/Android.bp b/test/1972-jni-id-swap-indices/Android.bp index b0d454ce18..17a052a1c9 100644 --- a/test/1972-jni-id-swap-indices/Android.bp +++ b/test/1972-jni-id-swap-indices/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1972-jni-id-swap-indices", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1972-jni-id-swap-indices-expected"], } diff --git a/test/1973-jni-id-swap-pointer/Android.bp b/test/1973-jni-id-swap-pointer/Android.bp index 66c6c5773e..ac64c79367 100644 --- a/test/1973-jni-id-swap-pointer/Android.bp +++ b/test/1973-jni-id-swap-pointer/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1973-jni-id-swap-pointer", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1973-jni-id-swap-pointer-expected"], } diff --git a/test/1974-resize-array/Android.bp b/test/1974-resize-array/Android.bp index 4ffb178abb..ae6603381b 100644 --- a/test/1974-resize-array/Android.bp +++ b/test/1974-resize-array/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1974-resize-array", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1974-resize-array-expected"], } diff --git a/test/1975-hello-structural-transformation/Android.bp b/test/1975-hello-structural-transformation/Android.bp index 872a906176..b82fdf10ab 100644 --- a/test/1975-hello-structural-transformation/Android.bp +++ b/test/1975-hello-structural-transformation/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1975-hello-structural-transformation", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1975-hello-structural-transformation-expected"], } diff --git a/test/1976-hello-structural-static-methods/Android.bp b/test/1976-hello-structural-static-methods/Android.bp index dc27b02e1a..e062149d93 100644 --- a/test/1976-hello-structural-static-methods/Android.bp +++ b/test/1976-hello-structural-static-methods/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1976-hello-structural-static-methods", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1976-hello-structural-static-methods-expected"], } diff --git a/test/1977-hello-structural-obsolescence/Android.bp b/test/1977-hello-structural-obsolescence/Android.bp index 8c116bc9e5..44e0f9f9c1 100644 --- a/test/1977-hello-structural-obsolescence/Android.bp +++ b/test/1977-hello-structural-obsolescence/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1977-hello-structural-obsolescence", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1977-hello-structural-obsolescence-expected"], } diff --git a/test/1978-regular-obsolete-then-structural-obsolescence/Android.bp b/test/1978-regular-obsolete-then-structural-obsolescence/Android.bp index 6dc0ae8fe3..12fa774c10 100644 --- a/test/1978-regular-obsolete-then-structural-obsolescence/Android.bp +++ b/test/1978-regular-obsolete-then-structural-obsolescence/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1978-regular-obsolete-then-structural-obsolescence", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1978-regular-obsolete-then-structural-obsolescence-expected"], } diff --git a/test/1979-threaded-structural-transformation/Android.bp b/test/1979-threaded-structural-transformation/Android.bp index 9b7dbad4b6..23727fce4a 100644 --- a/test/1979-threaded-structural-transformation/Android.bp +++ b/test/1979-threaded-structural-transformation/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1979-threaded-structural-transformation", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1979-threaded-structural-transformation-expected"], } diff --git a/test/1980-obsolete-object-cleared/Android.bp b/test/1980-obsolete-object-cleared/Android.bp index 924a379d5c..08bb5d852c 100644 --- a/test/1980-obsolete-object-cleared/Android.bp +++ b/test/1980-obsolete-object-cleared/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1980-obsolete-object-cleared", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1980-obsolete-object-cleared-expected"], } diff --git a/test/1982-no-virtuals-structural-redefinition/Android.bp b/test/1982-no-virtuals-structural-redefinition/Android.bp index 364a97933e..02a5df5e4a 100644 --- a/test/1982-no-virtuals-structural-redefinition/Android.bp +++ b/test/1982-no-virtuals-structural-redefinition/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1982-no-virtuals-structural-redefinition", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1982-no-virtuals-structural-redefinition-expected"], } diff --git a/test/1984-structural-redefine-field-trace/Android.bp b/test/1984-structural-redefine-field-trace/Android.bp index b64db10130..00762d1aa3 100644 --- a/test/1984-structural-redefine-field-trace/Android.bp +++ b/test/1984-structural-redefine-field-trace/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1984-structural-redefine-field-trace", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1984-structural-redefine-field-trace-expected"], } diff --git a/test/1985-structural-redefine-stack-scope/Android.bp b/test/1985-structural-redefine-stack-scope/Android.bp index 496faad825..a9c42c2877 100644 --- a/test/1985-structural-redefine-stack-scope/Android.bp +++ b/test/1985-structural-redefine-stack-scope/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1985-structural-redefine-stack-scope", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1985-structural-redefine-stack-scope-expected"], } diff --git a/test/1986-structural-redefine-multi-thread-stack-scope/Android.bp b/test/1986-structural-redefine-multi-thread-stack-scope/Android.bp index 5748d24b8c..d452642b34 100644 --- a/test/1986-structural-redefine-multi-thread-stack-scope/Android.bp +++ b/test/1986-structural-redefine-multi-thread-stack-scope/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1986-structural-redefine-multi-thread-stack-scope", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1986-structural-redefine-multi-thread-stack-scope-expected"], } diff --git a/test/1987-structural-redefine-recursive-stack-scope/Android.bp b/test/1987-structural-redefine-recursive-stack-scope/Android.bp index 89a5e272b7..75dac8b4f0 100644 --- a/test/1987-structural-redefine-recursive-stack-scope/Android.bp +++ b/test/1987-structural-redefine-recursive-stack-scope/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1987-structural-redefine-recursive-stack-scope", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1987-structural-redefine-recursive-stack-scope-expected"], } diff --git a/test/1988-multi-structural-redefine/Android.bp b/test/1988-multi-structural-redefine/Android.bp index 204a5368b2..b58b6df653 100644 --- a/test/1988-multi-structural-redefine/Android.bp +++ b/test/1988-multi-structural-redefine/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1988-multi-structural-redefine", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1988-multi-structural-redefine-expected"], } diff --git a/test/1989-transform-bad-monitor/Android.bp b/test/1989-transform-bad-monitor/Android.bp index e5c2049f6c..40342db29c 100644 --- a/test/1989-transform-bad-monitor/Android.bp +++ b/test/1989-transform-bad-monitor/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1989-transform-bad-monitor", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1989-transform-bad-monitor-expected"], } diff --git a/test/1990-structural-bad-verify/Android.bp b/test/1990-structural-bad-verify/Android.bp index 2c4f7c5453..2bbdb3cc3c 100644 --- a/test/1990-structural-bad-verify/Android.bp +++ b/test/1990-structural-bad-verify/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1990-structural-bad-verify", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1990-structural-bad-verify-expected"], } diff --git a/test/1991-hello-structural-retransform/Android.bp b/test/1991-hello-structural-retransform/Android.bp index 9fb8b89e63..3411cf1eb5 100644 --- a/test/1991-hello-structural-retransform/Android.bp +++ b/test/1991-hello-structural-retransform/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1991-hello-structural-retransform", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1991-hello-structural-retransform-expected"], } diff --git a/test/1992-retransform-no-such-field/Android.bp b/test/1992-retransform-no-such-field/Android.bp index 7bb0d2ec05..8621df75d8 100644 --- a/test/1992-retransform-no-such-field/Android.bp +++ b/test/1992-retransform-no-such-field/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1992-retransform-no-such-field", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1992-retransform-no-such-field-expected"], } diff --git a/test/1993-fallback-non-structural/Android.bp b/test/1993-fallback-non-structural/Android.bp index 1a1fcf3f46..6b7a326c74 100644 --- a/test/1993-fallback-non-structural/Android.bp +++ b/test/1993-fallback-non-structural/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1993-fallback-non-structural", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1993-fallback-non-structural-expected"], } diff --git a/test/1994-final-virtual-structural/Android.bp b/test/1994-final-virtual-structural/Android.bp index 772cdfe7b7..676f9626e5 100644 --- a/test/1994-final-virtual-structural/Android.bp +++ b/test/1994-final-virtual-structural/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1994-final-virtual-structural", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1994-final-virtual-structural-expected"], } diff --git a/test/1995-final-virtual-structural-multithread/Android.bp b/test/1995-final-virtual-structural-multithread/Android.bp index 735d24d6da..49b205c935 100644 --- a/test/1995-final-virtual-structural-multithread/Android.bp +++ b/test/1995-final-virtual-structural-multithread/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1995-final-virtual-structural-multithread", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1995-final-virtual-structural-multithread-expected"], } diff --git a/test/1996-final-override-virtual-structural/Android.bp b/test/1996-final-override-virtual-structural/Android.bp index a35a4233e8..3322a266b9 100644 --- a/test/1996-final-override-virtual-structural/Android.bp +++ b/test/1996-final-override-virtual-structural/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1996-final-override-virtual-structural", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1996-final-override-virtual-structural-expected"], } diff --git a/test/1997-structural-shadow-method/Android.bp b/test/1997-structural-shadow-method/Android.bp index c9392ec8ca..0f971c9a3e 100644 --- a/test/1997-structural-shadow-method/Android.bp +++ b/test/1997-structural-shadow-method/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1997-structural-shadow-method", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1997-structural-shadow-method-expected"], } diff --git a/test/1998-structural-shadow-field/Android.bp b/test/1998-structural-shadow-field/Android.bp index d7bc840eff..4d09189e1c 100644 --- a/test/1998-structural-shadow-field/Android.bp +++ b/test/1998-structural-shadow-field/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1998-structural-shadow-field", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1998-structural-shadow-field-expected"], } diff --git a/test/1999-virtual-structural/Android.bp b/test/1999-virtual-structural/Android.bp index 5aac38eeba..4def4c6adb 100644 --- a/test/1999-virtual-structural/Android.bp +++ b/test/1999-virtual-structural/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-1999-virtual-structural", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-1999-virtual-structural-expected"], } diff --git a/test/2003-double-virtual-structural/Android.bp b/test/2003-double-virtual-structural/Android.bp index 8272d1c846..3b6cdcafce 100644 --- a/test/2003-double-virtual-structural/Android.bp +++ b/test/2003-double-virtual-structural/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-2003-double-virtual-structural", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-2003-double-virtual-structural-expected"], } diff --git a/test/2004-double-virtual-structural-abstract/Android.bp b/test/2004-double-virtual-structural-abstract/Android.bp index fa924e0514..60980f38c5 100644 --- a/test/2004-double-virtual-structural-abstract/Android.bp +++ b/test/2004-double-virtual-structural-abstract/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-2004-double-virtual-structural-abstract", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-2004-double-virtual-structural-abstract-expected"], } diff --git a/test/2005-pause-all-redefine-multithreaded/Android.bp b/test/2005-pause-all-redefine-multithreaded/Android.bp index ac7ef4b57f..67aa6f58cd 100644 --- a/test/2005-pause-all-redefine-multithreaded/Android.bp +++ b/test/2005-pause-all-redefine-multithreaded/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-2005-pause-all-redefine-multithreaded", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-2005-pause-all-redefine-multithreaded-expected"], } diff --git a/test/2008-redefine-then-old-reflect-field/Android.bp b/test/2008-redefine-then-old-reflect-field/Android.bp index c142f97acf..07302a3aac 100644 --- a/test/2008-redefine-then-old-reflect-field/Android.bp +++ b/test/2008-redefine-then-old-reflect-field/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-2008-redefine-then-old-reflect-field", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-2008-redefine-then-old-reflect-field-expected"], } diff --git a/test/201-built-in-except-detail-messages/Android.bp b/test/201-built-in-except-detail-messages/Android.bp index 6356ffd73f..23a3dddef5 100644 --- a/test/201-built-in-except-detail-messages/Android.bp +++ b/test/201-built-in-except-detail-messages/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-201-built-in-except-detail-messages", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-201-built-in-except-detail-messages-expected"], } diff --git a/test/2011-stack-walk-concurrent-instrument/Android.bp b/test/2011-stack-walk-concurrent-instrument/Android.bp index 76ec5d1cff..efaf2116be 100644 --- a/test/2011-stack-walk-concurrent-instrument/Android.bp +++ b/test/2011-stack-walk-concurrent-instrument/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-2011-stack-walk-concurrent-instrument", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-2011-stack-walk-concurrent-instrument-expected"], } diff --git a/test/2019-constantcalculationsinking/Android.bp b/test/2019-constantcalculationsinking/Android.bp index 6a66ca42f3..bab9f747e6 100644 --- a/test/2019-constantcalculationsinking/Android.bp +++ b/test/2019-constantcalculationsinking/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-2019-constantcalculationsinking", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-2019-constantcalculationsinking-expected"], } diff --git a/test/202-thread-oome/Android.bp b/test/202-thread-oome/Android.bp index 4a1daa47fd..928b9f8d33 100644 --- a/test/202-thread-oome/Android.bp +++ b/test/202-thread-oome/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-202-thread-oome", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-202-thread-oome-expected"], } diff --git a/test/2020-InvokeVirtual-Inlining/Android.bp b/test/2020-InvokeVirtual-Inlining/Android.bp index a864652a4d..134820b9c7 100644 --- a/test/2020-InvokeVirtual-Inlining/Android.bp +++ b/test/2020-InvokeVirtual-Inlining/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-2020-InvokeVirtual-Inlining", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-2020-InvokeVirtual-Inlining-expected"], } diff --git a/test/2021-InvokeStatic-Inlining/Android.bp b/test/2021-InvokeStatic-Inlining/Android.bp index 8ba4512a58..682d811e23 100644 --- a/test/2021-InvokeStatic-Inlining/Android.bp +++ b/test/2021-InvokeStatic-Inlining/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-2021-InvokeStatic-Inlining", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-2021-InvokeStatic-Inlining-expected"], } diff --git a/test/2022-Invariantloops/Android.bp b/test/2022-Invariantloops/Android.bp index 337e0069f6..a9118e3590 100644 --- a/test/2022-Invariantloops/Android.bp +++ b/test/2022-Invariantloops/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-2022-Invariantloops", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-2022-Invariantloops-expected"], } diff --git a/test/2023-InvariantLoops_typecast/Android.bp b/test/2023-InvariantLoops_typecast/Android.bp index c84f2c63e1..f993d61190 100644 --- a/test/2023-InvariantLoops_typecast/Android.bp +++ b/test/2023-InvariantLoops_typecast/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-2023-InvariantLoops_typecast", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-2023-InvariantLoops_typecast-expected"], } diff --git a/test/2024-InvariantNegativeLoop/Android.bp b/test/2024-InvariantNegativeLoop/Android.bp index 266c5fa107..115f101dad 100644 --- a/test/2024-InvariantNegativeLoop/Android.bp +++ b/test/2024-InvariantNegativeLoop/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-2024-InvariantNegativeLoop", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-2024-InvariantNegativeLoop-expected"], } diff --git a/test/2025-ChangedArrayValue/Android.bp b/test/2025-ChangedArrayValue/Android.bp index a1c8d39989..6260dc9c9b 100644 --- a/test/2025-ChangedArrayValue/Android.bp +++ b/test/2025-ChangedArrayValue/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-2025-ChangedArrayValue", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-2025-ChangedArrayValue-expected"], } diff --git a/test/2026-DifferentMemoryLSCouples/Android.bp b/test/2026-DifferentMemoryLSCouples/Android.bp index 642ccaddea..0d2cd3cee8 100644 --- a/test/2026-DifferentMemoryLSCouples/Android.bp +++ b/test/2026-DifferentMemoryLSCouples/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-2026-DifferentMemoryLSCouples", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-2026-DifferentMemoryLSCouples-expected"], } diff --git a/test/2027-TwiceTheSameMemoryCouple/Android.bp b/test/2027-TwiceTheSameMemoryCouple/Android.bp index 163809463a..2ff6a913fe 100644 --- a/test/2027-TwiceTheSameMemoryCouple/Android.bp +++ b/test/2027-TwiceTheSameMemoryCouple/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-2027-TwiceTheSameMemoryCouple", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-2027-TwiceTheSameMemoryCouple-expected"], } diff --git a/test/2028-MultiBackward/Android.bp b/test/2028-MultiBackward/Android.bp index 2b298ca2d7..45e5e63167 100644 --- a/test/2028-MultiBackward/Android.bp +++ b/test/2028-MultiBackward/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-2028-MultiBackward", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-2028-MultiBackward-expected"], } diff --git a/test/2029-contended-monitors/Android.bp b/test/2029-contended-monitors/Android.bp index fe4bed025a..9c0067b051 100644 --- a/test/2029-contended-monitors/Android.bp +++ b/test/2029-contended-monitors/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-2029-contended-monitors", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-2029-contended-monitors-expected"], } diff --git a/test/203-multi-checkpoint/Android.bp b/test/203-multi-checkpoint/Android.bp index 6c8ed70550..80d557ad94 100644 --- a/test/203-multi-checkpoint/Android.bp +++ b/test/203-multi-checkpoint/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-203-multi-checkpoint", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-203-multi-checkpoint-expected"], } diff --git a/test/2030-long-running-child/Android.bp b/test/2030-long-running-child/Android.bp index 786c8d990e..cfdb7a0414 100644 --- a/test/2030-long-running-child/Android.bp +++ b/test/2030-long-running-child/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-2030-long-running-child", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-2030-long-running-child-expected"], } diff --git a/test/2031-zygote-compiled-frame-deopt/Android.bp b/test/2031-zygote-compiled-frame-deopt/Android.bp index d111eb0168..6419655954 100644 --- a/test/2031-zygote-compiled-frame-deopt/Android.bp +++ b/test/2031-zygote-compiled-frame-deopt/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-2031-zygote-compiled-frame-deopt", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-2031-zygote-compiled-frame-deopt-expected"], } diff --git a/test/2033-shutdown-mechanics/Android.bp b/test/2033-shutdown-mechanics/Android.bp index 09a40c6c8e..f36b49f83b 100644 --- a/test/2033-shutdown-mechanics/Android.bp +++ b/test/2033-shutdown-mechanics/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-2033-shutdown-mechanics", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-2033-shutdown-mechanics-expected"], } diff --git a/test/2036-jni-filechannel/Android.bp b/test/2036-jni-filechannel/Android.bp index 27d84dd972..588794e7b8 100644 --- a/test/2036-jni-filechannel/Android.bp +++ b/test/2036-jni-filechannel/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-2036-jni-filechannel", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-2036-jni-filechannel-expected"], } diff --git a/test/2037-thread-name-inherit/Android.bp b/test/2037-thread-name-inherit/Android.bp index 8cda6b59b4..e17a8cf0bb 100644 --- a/test/2037-thread-name-inherit/Android.bp +++ b/test/2037-thread-name-inherit/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-2037-thread-name-inherit", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-2037-thread-name-inherit-expected"], } diff --git a/test/2231-checker-heap-poisoning/Android.bp b/test/2231-checker-heap-poisoning/Android.bp index 3c1d51db03..f873518807 100644 --- a/test/2231-checker-heap-poisoning/Android.bp +++ b/test/2231-checker-heap-poisoning/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-2231-checker-heap-poisoning-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/300-package-override/Android.bp b/test/300-package-override/Android.bp index c429b09a4b..c1092072d8 100644 --- a/test/300-package-override/Android.bp +++ b/test/300-package-override/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-300-package-override", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-300-package-override-expected"], } diff --git a/test/301-abstract-protected/Android.bp b/test/301-abstract-protected/Android.bp index dced84dd8d..a4cc45cc50 100644 --- a/test/301-abstract-protected/Android.bp +++ b/test/301-abstract-protected/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-301-abstract-protected", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-301-abstract-protected-expected"], } diff --git a/test/302-float-conversion/Android.bp b/test/302-float-conversion/Android.bp index 3556130bb6..721a34a94a 100644 --- a/test/302-float-conversion/Android.bp +++ b/test/302-float-conversion/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-302-float-conversion", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-302-float-conversion-expected"], } diff --git a/test/304-method-tracing/Android.bp b/test/304-method-tracing/Android.bp index 5087202f8f..388dd389e3 100644 --- a/test/304-method-tracing/Android.bp +++ b/test/304-method-tracing/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-304-method-tracing", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-304-method-tracing-expected"], } diff --git a/test/305-other-fault-handler/Android.bp b/test/305-other-fault-handler/Android.bp index 493f777203..37a05d99f3 100644 --- a/test/305-other-fault-handler/Android.bp +++ b/test/305-other-fault-handler/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-305-other-fault-handler", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-305-other-fault-handler-expected"], } diff --git a/test/401-optimizing-compiler/Android.bp b/test/401-optimizing-compiler/Android.bp index 5ba3345a05..19cc94a8ed 100644 --- a/test/401-optimizing-compiler/Android.bp +++ b/test/401-optimizing-compiler/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-401-optimizing-compiler", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-401-optimizing-compiler-expected"], } diff --git a/test/402-optimizing-control-flow/Android.bp b/test/402-optimizing-control-flow/Android.bp index bca5cc08a5..ddc024437d 100644 --- a/test/402-optimizing-control-flow/Android.bp +++ b/test/402-optimizing-control-flow/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-402-optimizing-control-flow", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-402-optimizing-control-flow-expected"], } diff --git a/test/403-optimizing-long/Android.bp b/test/403-optimizing-long/Android.bp index aa67c5ccda..9c6fac3b29 100644 --- a/test/403-optimizing-long/Android.bp +++ b/test/403-optimizing-long/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-403-optimizing-long", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-403-optimizing-long-expected"], } diff --git a/test/404-optimizing-allocator/Android.bp b/test/404-optimizing-allocator/Android.bp index a8b98bec13..d7ca988a18 100644 --- a/test/404-optimizing-allocator/Android.bp +++ b/test/404-optimizing-allocator/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-404-optimizing-allocator", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-404-optimizing-allocator-expected"], } diff --git a/test/405-optimizing-long-allocator/Android.bp b/test/405-optimizing-long-allocator/Android.bp index da1846eb18..50251fc942 100644 --- a/test/405-optimizing-long-allocator/Android.bp +++ b/test/405-optimizing-long-allocator/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-405-optimizing-long-allocator", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-405-optimizing-long-allocator-expected"], } diff --git a/test/406-fields/Android.bp b/test/406-fields/Android.bp index 3f9d7dec7b..6a08f78200 100644 --- a/test/406-fields/Android.bp +++ b/test/406-fields/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-406-fields", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-406-fields-expected"], } diff --git a/test/407-arrays/Android.bp b/test/407-arrays/Android.bp index cdcb760b92..175cfa6634 100644 --- a/test/407-arrays/Android.bp +++ b/test/407-arrays/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-407-arrays", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-407-arrays-expected"], } diff --git a/test/408-move-bug/Android.bp b/test/408-move-bug/Android.bp index fdd432154a..b050b8b05a 100644 --- a/test/408-move-bug/Android.bp +++ b/test/408-move-bug/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-408-move-bug", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-408-move-bug-expected"], } diff --git a/test/409-materialized-condition/Android.bp b/test/409-materialized-condition/Android.bp index 272bef3241..b41312fd0e 100644 --- a/test/409-materialized-condition/Android.bp +++ b/test/409-materialized-condition/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-409-materialized-condition", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-409-materialized-condition-expected"], } diff --git a/test/410-floats/Android.bp b/test/410-floats/Android.bp index d98746d754..509ea62623 100644 --- a/test/410-floats/Android.bp +++ b/test/410-floats/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-410-floats", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-410-floats-expected"], } diff --git a/test/411-checker-hdiv-hrem-const/Android.bp b/test/411-checker-hdiv-hrem-const/Android.bp index 45a4f4e348..b527c35061 100644 --- a/test/411-checker-hdiv-hrem-const/Android.bp +++ b/test/411-checker-hdiv-hrem-const/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-411-checker-hdiv-hrem-const", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-411-checker-hdiv-hrem-const-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/411-checker-hdiv-hrem-pow2/Android.bp b/test/411-checker-hdiv-hrem-pow2/Android.bp index cd97b0fcf7..5dc3f09c05 100644 --- a/test/411-checker-hdiv-hrem-pow2/Android.bp +++ b/test/411-checker-hdiv-hrem-pow2/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-411-checker-hdiv-hrem-pow2-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/411-checker-instruct-simplifier-hrem/Android.bp b/test/411-checker-instruct-simplifier-hrem/Android.bp index a7e0f00a52..6268107ab1 100644 --- a/test/411-checker-instruct-simplifier-hrem/Android.bp +++ b/test/411-checker-instruct-simplifier-hrem/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-411-checker-instruct-simplifier-hrem-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/411-optimizing-arith/Android.bp b/test/411-optimizing-arith/Android.bp index 6c3877644e..ab74289940 100644 --- a/test/411-optimizing-arith/Android.bp +++ b/test/411-optimizing-arith/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-411-optimizing-arith", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-411-optimizing-arith-expected"], } diff --git a/test/413-regalloc-regression/Android.bp b/test/413-regalloc-regression/Android.bp index 1f520b7f11..b03afd8794 100644 --- a/test/413-regalloc-regression/Android.bp +++ b/test/413-regalloc-regression/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-413-regalloc-regression", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-413-regalloc-regression-expected"], } diff --git a/test/414-static-fields/Android.bp b/test/414-static-fields/Android.bp index f225dee8ed..5ae7f5b585 100644 --- a/test/414-static-fields/Android.bp +++ b/test/414-static-fields/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-414-static-fields", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-414-static-fields-expected"], } diff --git a/test/418-const-string/Android.bp b/test/418-const-string/Android.bp index 274e798c0c..6dc20671f0 100644 --- a/test/418-const-string/Android.bp +++ b/test/418-const-string/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-418-const-string", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-418-const-string-expected"], } diff --git a/test/419-long-parameter/Android.bp b/test/419-long-parameter/Android.bp index 67360ce0e7..90f1fc2dc4 100644 --- a/test/419-long-parameter/Android.bp +++ b/test/419-long-parameter/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-419-long-parameter", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-419-long-parameter-expected"], } diff --git a/test/420-const-class/Android.bp b/test/420-const-class/Android.bp index 84446a04af..8c08f06629 100644 --- a/test/420-const-class/Android.bp +++ b/test/420-const-class/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-420-const-class", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-420-const-class-expected"], } diff --git a/test/421-exceptions/Android.bp b/test/421-exceptions/Android.bp index 4ef5789506..1313ad5a80 100644 --- a/test/421-exceptions/Android.bp +++ b/test/421-exceptions/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-421-exceptions", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-421-exceptions-expected"], } diff --git a/test/421-large-frame/Android.bp b/test/421-large-frame/Android.bp index dd77a65fd0..f51a0b1d04 100644 --- a/test/421-large-frame/Android.bp +++ b/test/421-large-frame/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-421-large-frame", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-421-large-frame-expected"], } diff --git a/test/422-instanceof/Android.bp b/test/422-instanceof/Android.bp index f9fc56a4cb..e35486922c 100644 --- a/test/422-instanceof/Android.bp +++ b/test/422-instanceof/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-422-instanceof", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-422-instanceof-expected"], } diff --git a/test/422-type-conversion/Android.bp b/test/422-type-conversion/Android.bp index 774d7d96bf..5c5468c1b7 100644 --- a/test/422-type-conversion/Android.bp +++ b/test/422-type-conversion/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-422-type-conversion", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-422-type-conversion-expected"], } diff --git a/test/423-invoke-interface/Android.bp b/test/423-invoke-interface/Android.bp index c8e248ef03..ed88de5a53 100644 --- a/test/423-invoke-interface/Android.bp +++ b/test/423-invoke-interface/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-423-invoke-interface", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-423-invoke-interface-expected"], } diff --git a/test/424-checkcast/Android.bp b/test/424-checkcast/Android.bp index a5bf397dd8..167ef90d71 100644 --- a/test/424-checkcast/Android.bp +++ b/test/424-checkcast/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-424-checkcast", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-424-checkcast-expected"], } diff --git a/test/426-monitor/Android.bp b/test/426-monitor/Android.bp index 8aa23901f4..587f407616 100644 --- a/test/426-monitor/Android.bp +++ b/test/426-monitor/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-426-monitor", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-426-monitor-expected"], } diff --git a/test/427-bitwise/Android.bp b/test/427-bitwise/Android.bp index d868b31e0f..c2c457836e 100644 --- a/test/427-bitwise/Android.bp +++ b/test/427-bitwise/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-427-bitwise", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-427-bitwise-expected"], } diff --git a/test/427-bounds/Android.bp b/test/427-bounds/Android.bp index 99ce6e40e2..01d4feb797 100644 --- a/test/427-bounds/Android.bp +++ b/test/427-bounds/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-427-bounds", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-427-bounds-expected"], } diff --git a/test/429-ssa-builder/Android.bp b/test/429-ssa-builder/Android.bp index ae07ca4150..ce181421c9 100644 --- a/test/429-ssa-builder/Android.bp +++ b/test/429-ssa-builder/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-429-ssa-builder", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-429-ssa-builder-expected"], } diff --git a/test/430-live-register-slow-path/Android.bp b/test/430-live-register-slow-path/Android.bp index 49e504a69a..3220b482b6 100644 --- a/test/430-live-register-slow-path/Android.bp +++ b/test/430-live-register-slow-path/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-430-live-register-slow-path", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-430-live-register-slow-path-expected"], } diff --git a/test/433-gvn/Android.bp b/test/433-gvn/Android.bp index dc6e321bf0..1cd72424b3 100644 --- a/test/433-gvn/Android.bp +++ b/test/433-gvn/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-433-gvn", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-433-gvn-expected"], } diff --git a/test/434-shifter-operand/Android.bp b/test/434-shifter-operand/Android.bp index 0c8ead3f72..736a3c80b8 100644 --- a/test/434-shifter-operand/Android.bp +++ b/test/434-shifter-operand/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-434-shifter-operand", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-434-shifter-operand-expected"], } diff --git a/test/435-try-finally-without-catch/Android.bp b/test/435-try-finally-without-catch/Android.bp index d6ef617a36..1b1f8bca15 100644 --- a/test/435-try-finally-without-catch/Android.bp +++ b/test/435-try-finally-without-catch/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-435-try-finally-without-catch", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-435-try-finally-without-catch-expected"], } diff --git a/test/436-rem-float/Android.bp b/test/436-rem-float/Android.bp index 3a8c8c42f1..1271417536 100644 --- a/test/436-rem-float/Android.bp +++ b/test/436-rem-float/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-436-rem-float", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-436-rem-float-expected"], } diff --git a/test/436-shift-constant/Android.bp b/test/436-shift-constant/Android.bp index 6d2c328784..a53ddc4423 100644 --- a/test/436-shift-constant/Android.bp +++ b/test/436-shift-constant/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-436-shift-constant", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-436-shift-constant-expected"], } diff --git a/test/437-inline/Android.bp b/test/437-inline/Android.bp index bfc7288040..6d4079d37f 100644 --- a/test/437-inline/Android.bp +++ b/test/437-inline/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-437-inline", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-437-inline-expected"], } diff --git a/test/438-volatile/Android.bp b/test/438-volatile/Android.bp index f8cc4a065f..c87914d8d3 100644 --- a/test/438-volatile/Android.bp +++ b/test/438-volatile/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-438-volatile", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-438-volatile-expected"], } diff --git a/test/439-npe/Android.bp b/test/439-npe/Android.bp index 9bc9227b3b..a9402bd7b3 100644 --- a/test/439-npe/Android.bp +++ b/test/439-npe/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-439-npe", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-439-npe-expected"], } diff --git a/test/439-swap-double/Android.bp b/test/439-swap-double/Android.bp index 712b690325..c29d7f7b72 100644 --- a/test/439-swap-double/Android.bp +++ b/test/439-swap-double/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-439-swap-double", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-439-swap-double-expected"], } diff --git a/test/440-stmp/Android.bp b/test/440-stmp/Android.bp index b396b56c3f..d6316ebbe7 100644 --- a/test/440-stmp/Android.bp +++ b/test/440-stmp/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-440-stmp", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-440-stmp-expected"], } diff --git a/test/441-checker-inliner/Android.bp b/test/441-checker-inliner/Android.bp index 68638b05ed..867399d466 100644 --- a/test/441-checker-inliner/Android.bp +++ b/test/441-checker-inliner/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-441-checker-inliner-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/443-not-bool-inline/Android.bp b/test/443-not-bool-inline/Android.bp index 8480485dd8..f6e8e9b622 100644 --- a/test/443-not-bool-inline/Android.bp +++ b/test/443-not-bool-inline/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-443-not-bool-inline", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-443-not-bool-inline-expected"], } diff --git a/test/444-checker-nce/Android.bp b/test/444-checker-nce/Android.bp index 40b24c1fd6..30aed54745 100644 --- a/test/444-checker-nce/Android.bp +++ b/test/444-checker-nce/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-444-checker-nce-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/445-checker-licm/Android.bp b/test/445-checker-licm/Android.bp index 14cced8da2..c113483846 100644 --- a/test/445-checker-licm/Android.bp +++ b/test/445-checker-licm/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-445-checker-licm-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/446-checker-inliner2/Android.bp b/test/446-checker-inliner2/Android.bp index 5c27f52088..cd2c5f6d0d 100644 --- a/test/446-checker-inliner2/Android.bp +++ b/test/446-checker-inliner2/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-446-checker-inliner2-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/447-checker-inliner3/Android.bp b/test/447-checker-inliner3/Android.bp index 14cca80777..7ff8f729d7 100644 --- a/test/447-checker-inliner3/Android.bp +++ b/test/447-checker-inliner3/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-447-checker-inliner3-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/449-checker-bce-rem/Android.bp b/test/449-checker-bce-rem/Android.bp index b591a6bc9c..b1a7aa71bf 100644 --- a/test/449-checker-bce-rem/Android.bp +++ b/test/449-checker-bce-rem/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-449-checker-bce-rem-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/449-checker-bce/Android.bp b/test/449-checker-bce/Android.bp index 98ea24277d..7c48bbcc7c 100644 --- a/test/449-checker-bce/Android.bp +++ b/test/449-checker-bce/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-449-checker-bce", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-449-checker-bce-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/450-checker-types/Android.bp b/test/450-checker-types/Android.bp index ea579b971b..ff1bb3bf25 100644 --- a/test/450-checker-types/Android.bp +++ b/test/450-checker-types/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-450-checker-types-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/451-regression-add-float/Android.bp b/test/451-regression-add-float/Android.bp index a473db7633..ddf7285d0b 100644 --- a/test/451-regression-add-float/Android.bp +++ b/test/451-regression-add-float/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-451-regression-add-float", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-451-regression-add-float-expected"], } diff --git a/test/451-spill-splot/Android.bp b/test/451-spill-splot/Android.bp index fde3892eb8..b4e33a2eaf 100644 --- a/test/451-spill-splot/Android.bp +++ b/test/451-spill-splot/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-451-spill-splot", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-451-spill-splot-expected"], } diff --git a/test/454-get-vreg/Android.bp b/test/454-get-vreg/Android.bp index 857f9a2d2e..08b8ee9989 100644 --- a/test/454-get-vreg/Android.bp +++ b/test/454-get-vreg/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-454-get-vreg", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-454-get-vreg-expected"], } diff --git a/test/455-checker-gvn/Android.bp b/test/455-checker-gvn/Android.bp index d102957015..7523c35330 100644 --- a/test/455-checker-gvn/Android.bp +++ b/test/455-checker-gvn/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-455-checker-gvn-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/456-baseline-array-set/Android.bp b/test/456-baseline-array-set/Android.bp index 22beae4852..c348ddec7b 100644 --- a/test/456-baseline-array-set/Android.bp +++ b/test/456-baseline-array-set/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-456-baseline-array-set", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-456-baseline-array-set-expected"], } diff --git a/test/458-long-to-fpu/Android.bp b/test/458-long-to-fpu/Android.bp index a5b01c1f10..404a13cf6e 100644 --- a/test/458-long-to-fpu/Android.bp +++ b/test/458-long-to-fpu/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-458-long-to-fpu", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-458-long-to-fpu-expected"], } diff --git a/test/461-get-reference-vreg/Android.bp b/test/461-get-reference-vreg/Android.bp index 99d4a06eb3..a43250f279 100644 --- a/test/461-get-reference-vreg/Android.bp +++ b/test/461-get-reference-vreg/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-461-get-reference-vreg", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-461-get-reference-vreg-expected"], } diff --git a/test/464-checker-inline-sharpen-calls/Android.bp b/test/464-checker-inline-sharpen-calls/Android.bp index 442cb4b96e..15344534cf 100644 --- a/test/464-checker-inline-sharpen-calls/Android.bp +++ b/test/464-checker-inline-sharpen-calls/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-464-checker-inline-sharpen-calls-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/465-checker-clinit-gvn/Android.bp b/test/465-checker-clinit-gvn/Android.bp index 0b9fba76d4..bc97e6a815 100644 --- a/test/465-checker-clinit-gvn/Android.bp +++ b/test/465-checker-clinit-gvn/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-465-checker-clinit-gvn-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/466-get-live-vreg/Android.bp b/test/466-get-live-vreg/Android.bp index 3dc960486a..d9fd66a2a1 100644 --- a/test/466-get-live-vreg/Android.bp +++ b/test/466-get-live-vreg/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-466-get-live-vreg", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-466-get-live-vreg-expected"], } diff --git a/test/469-condition-materialization/Android.bp b/test/469-condition-materialization/Android.bp index 1fac4dd24e..3d3926eb0c 100644 --- a/test/469-condition-materialization/Android.bp +++ b/test/469-condition-materialization/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-469-condition-materialization", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-469-condition-materialization-expected"], } diff --git a/test/470-huge-method/Android.bp b/test/470-huge-method/Android.bp index b44467acf6..e077583e56 100644 --- a/test/470-huge-method/Android.bp +++ b/test/470-huge-method/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-470-huge-method", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-470-huge-method-expected"], } diff --git a/test/471-deopt-environment/Android.bp b/test/471-deopt-environment/Android.bp index 198eb2bb5d..7fa8c36c7f 100644 --- a/test/471-deopt-environment/Android.bp +++ b/test/471-deopt-environment/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-471-deopt-environment", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-471-deopt-environment-expected"], } diff --git a/test/472-type-propagation/Android.bp b/test/472-type-propagation/Android.bp index 150447d07e..7b7e195067 100644 --- a/test/472-type-propagation/Android.bp +++ b/test/472-type-propagation/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-472-type-propagation", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-472-type-propagation-expected"], } diff --git a/test/473-checker-inliner-constants/Android.bp b/test/473-checker-inliner-constants/Android.bp index 91ae059491..d9403fffd3 100644 --- a/test/473-checker-inliner-constants/Android.bp +++ b/test/473-checker-inliner-constants/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-473-checker-inliner-constants-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/473-remove-dead-block/Android.bp b/test/473-remove-dead-block/Android.bp index 1d9bb58852..1fb3d985b2 100644 --- a/test/473-remove-dead-block/Android.bp +++ b/test/473-remove-dead-block/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-473-remove-dead-block", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-473-remove-dead-block-expected"], } diff --git a/test/474-checker-boolean-input/Android.bp b/test/474-checker-boolean-input/Android.bp index fae6d7f757..129f14d1cd 100644 --- a/test/474-checker-boolean-input/Android.bp +++ b/test/474-checker-boolean-input/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-474-checker-boolean-input-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/474-fp-sub-neg/Android.bp b/test/474-fp-sub-neg/Android.bp index c0799faf00..279d7aa3c0 100644 --- a/test/474-fp-sub-neg/Android.bp +++ b/test/474-fp-sub-neg/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-474-fp-sub-neg", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-474-fp-sub-neg-expected"], } diff --git a/test/475-simplify-mul-zero/Android.bp b/test/475-simplify-mul-zero/Android.bp index 306edec249..05df6f8249 100644 --- a/test/475-simplify-mul-zero/Android.bp +++ b/test/475-simplify-mul-zero/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-475-simplify-mul-zero", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-475-simplify-mul-zero-expected"], } diff --git a/test/476-checker-ctor-fence-redun-elim/Android.bp b/test/476-checker-ctor-fence-redun-elim/Android.bp index 42863d8811..bf1dbabb4c 100644 --- a/test/476-checker-ctor-fence-redun-elim/Android.bp +++ b/test/476-checker-ctor-fence-redun-elim/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-476-checker-ctor-fence-redun-elim", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-476-checker-ctor-fence-redun-elim-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/476-checker-ctor-memory-barrier/Android.bp b/test/476-checker-ctor-memory-barrier/Android.bp index baee66bd8e..d607a21198 100644 --- a/test/476-checker-ctor-memory-barrier/Android.bp +++ b/test/476-checker-ctor-memory-barrier/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-476-checker-ctor-memory-barrier-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/476-clinit-inline-static-invoke/Android.bp b/test/476-clinit-inline-static-invoke/Android.bp index 036c1262de..37483e8d65 100644 --- a/test/476-clinit-inline-static-invoke/Android.bp +++ b/test/476-clinit-inline-static-invoke/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-476-clinit-inline-static-invoke", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-476-clinit-inline-static-invoke-expected"], } diff --git a/test/477-checker-bound-type/Android.bp b/test/477-checker-bound-type/Android.bp index c24edcf368..c83c2fcdc2 100644 --- a/test/477-checker-bound-type/Android.bp +++ b/test/477-checker-bound-type/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-477-checker-bound-type-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/477-long-2-float-convers-precision/Android.bp b/test/477-long-2-float-convers-precision/Android.bp index 00e2c3f0c4..916f23c8e6 100644 --- a/test/477-long-2-float-convers-precision/Android.bp +++ b/test/477-long-2-float-convers-precision/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-477-long-2-float-convers-precision", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-477-long-2-float-convers-precision-expected"], } diff --git a/test/478-checker-clinit-check-pruning/Android.bp b/test/478-checker-clinit-check-pruning/Android.bp index 1c8240eb2c..70685632a1 100644 --- a/test/478-checker-clinit-check-pruning/Android.bp +++ b/test/478-checker-clinit-check-pruning/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-478-checker-clinit-check-pruning", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-478-checker-clinit-check-pruning-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/478-checker-inline-noreturn/Android.bp b/test/478-checker-inline-noreturn/Android.bp index f692d06152..5c4b30215e 100644 --- a/test/478-checker-inline-noreturn/Android.bp +++ b/test/478-checker-inline-noreturn/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-478-checker-inline-noreturn-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/478-checker-inliner-nested-loop/Android.bp b/test/478-checker-inliner-nested-loop/Android.bp index 58cf6e6f0f..ed03cb333b 100644 --- a/test/478-checker-inliner-nested-loop/Android.bp +++ b/test/478-checker-inliner-nested-loop/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-478-checker-inliner-nested-loop-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/479-regression-implicit-null-check/Android.bp b/test/479-regression-implicit-null-check/Android.bp index 3dc346b600..ce7b79ba89 100644 --- a/test/479-regression-implicit-null-check/Android.bp +++ b/test/479-regression-implicit-null-check/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-479-regression-implicit-null-check", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-479-regression-implicit-null-check-expected"], } diff --git a/test/480-checker-dead-blocks/Android.bp b/test/480-checker-dead-blocks/Android.bp index 100e258f87..7d502354c8 100644 --- a/test/480-checker-dead-blocks/Android.bp +++ b/test/480-checker-dead-blocks/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-480-checker-dead-blocks-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/481-regression-phi-cond/Android.bp b/test/481-regression-phi-cond/Android.bp index 63d711c8f0..2e3b4ca5c9 100644 --- a/test/481-regression-phi-cond/Android.bp +++ b/test/481-regression-phi-cond/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-481-regression-phi-cond", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-481-regression-phi-cond-expected"], } diff --git a/test/482-checker-loop-back-edge-use/Android.bp b/test/482-checker-loop-back-edge-use/Android.bp index af8799a8fa..76b3de00d5 100644 --- a/test/482-checker-loop-back-edge-use/Android.bp +++ b/test/482-checker-loop-back-edge-use/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-482-checker-loop-back-edge-use", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-482-checker-loop-back-edge-use-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/483-dce-block/Android.bp b/test/483-dce-block/Android.bp index df128380c2..f08faa2c89 100644 --- a/test/483-dce-block/Android.bp +++ b/test/483-dce-block/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-483-dce-block", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-483-dce-block-expected"], } diff --git a/test/485-checker-dce-switch/Android.bp b/test/485-checker-dce-switch/Android.bp index 23e9e6f4c1..97d0355bd8 100644 --- a/test/485-checker-dce-switch/Android.bp +++ b/test/485-checker-dce-switch/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-485-checker-dce-switch-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/486-checker-must-do-null-check/Android.bp b/test/486-checker-must-do-null-check/Android.bp index dc4aaca79c..1dc030f1a8 100644 --- a/test/486-checker-must-do-null-check/Android.bp +++ b/test/486-checker-must-do-null-check/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-486-checker-must-do-null-check-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/487-checker-inline-calls/Android.bp b/test/487-checker-inline-calls/Android.bp index ce133cbd40..4114e3e676 100644 --- a/test/487-checker-inline-calls/Android.bp +++ b/test/487-checker-inline-calls/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-487-checker-inline-calls-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/488-checker-inline-recursive-calls/Android.bp b/test/488-checker-inline-recursive-calls/Android.bp index 385ba26fd8..aa78a3350b 100644 --- a/test/488-checker-inline-recursive-calls/Android.bp +++ b/test/488-checker-inline-recursive-calls/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-488-checker-inline-recursive-calls-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/489-current-method-regression/Android.bp b/test/489-current-method-regression/Android.bp index 9aed8c9e7f..f762e63241 100644 --- a/test/489-current-method-regression/Android.bp +++ b/test/489-current-method-regression/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-489-current-method-regression", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-489-current-method-regression-expected"], } diff --git a/test/490-checker-inline/Android.bp b/test/490-checker-inline/Android.bp index a73832c3ac..3126b3c3a9 100644 --- a/test/490-checker-inline/Android.bp +++ b/test/490-checker-inline/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-490-checker-inline-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/491-current-method/Android.bp b/test/491-current-method/Android.bp index af5410ea4d..d4063ad0ca 100644 --- a/test/491-current-method/Android.bp +++ b/test/491-current-method/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-491-current-method", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-491-current-method-expected"], } diff --git a/test/492-checker-inline-invoke-interface/Android.bp b/test/492-checker-inline-invoke-interface/Android.bp index 664a7b0e08..eb99ee81e6 100644 --- a/test/492-checker-inline-invoke-interface/Android.bp +++ b/test/492-checker-inline-invoke-interface/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-492-checker-inline-invoke-interface-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/493-checker-inline-invoke-interface/Android.bp b/test/493-checker-inline-invoke-interface/Android.bp index 0561f556a6..7437472489 100644 --- a/test/493-checker-inline-invoke-interface/Android.bp +++ b/test/493-checker-inline-invoke-interface/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-493-checker-inline-invoke-interface-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/494-checker-instanceof-tests/Android.bp b/test/494-checker-instanceof-tests/Android.bp index 76c12ae921..c04b433507 100644 --- a/test/494-checker-instanceof-tests/Android.bp +++ b/test/494-checker-instanceof-tests/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-494-checker-instanceof-tests-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/495-checker-checkcast-tests/Android.bp b/test/495-checker-checkcast-tests/Android.bp index 4fc4468d1b..2538927206 100644 --- a/test/495-checker-checkcast-tests/Android.bp +++ b/test/495-checker-checkcast-tests/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-495-checker-checkcast-tests-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/496-checker-inlining-class-loader/Android.bp b/test/496-checker-inlining-class-loader/Android.bp index ee99148a39..48e0591637 100644 --- a/test/496-checker-inlining-class-loader/Android.bp +++ b/test/496-checker-inlining-class-loader/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-496-checker-inlining-class-loader-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/497-inlining-and-class-loader/Android.bp b/test/497-inlining-and-class-loader/Android.bp index 57266d0c3b..e08e796044 100644 --- a/test/497-inlining-and-class-loader/Android.bp +++ b/test/497-inlining-and-class-loader/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-497-inlining-and-class-loader", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-497-inlining-and-class-loader-expected"], } diff --git a/test/499-bce-phi-array-length/Android.bp b/test/499-bce-phi-array-length/Android.bp index fbf2ad81a1..3dadc76122 100644 --- a/test/499-bce-phi-array-length/Android.bp +++ b/test/499-bce-phi-array-length/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-499-bce-phi-array-length", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-499-bce-phi-array-length-expected"], } diff --git a/test/500-instanceof/Android.bp b/test/500-instanceof/Android.bp index e0a75184d1..666993c07b 100644 --- a/test/500-instanceof/Android.bp +++ b/test/500-instanceof/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-500-instanceof", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-500-instanceof-expected"], } diff --git a/test/505-simplifier-type-propagation/Android.bp b/test/505-simplifier-type-propagation/Android.bp index 62d42db263..4c64f7202e 100644 --- a/test/505-simplifier-type-propagation/Android.bp +++ b/test/505-simplifier-type-propagation/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-505-simplifier-type-propagation", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-505-simplifier-type-propagation-expected"], } diff --git a/test/507-boolean-test/Android.bp b/test/507-boolean-test/Android.bp index 3d085b0ea6..1125f2c98a 100644 --- a/test/507-boolean-test/Android.bp +++ b/test/507-boolean-test/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-507-boolean-test", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-507-boolean-test-expected"], } diff --git a/test/507-referrer/Android.bp b/test/507-referrer/Android.bp index 42b6d85dad..749ffa70c4 100644 --- a/test/507-referrer/Android.bp +++ b/test/507-referrer/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-507-referrer", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-507-referrer-expected"], } diff --git a/test/508-checker-disassembly/Android.bp b/test/508-checker-disassembly/Android.bp index d73987a932..47d90b887f 100644 --- a/test/508-checker-disassembly/Android.bp +++ b/test/508-checker-disassembly/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-508-checker-disassembly-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/508-referrer-method/Android.bp b/test/508-referrer-method/Android.bp index b1483132cd..53e4d0363d 100644 --- a/test/508-referrer-method/Android.bp +++ b/test/508-referrer-method/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-508-referrer-method", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-508-referrer-method-expected"], } diff --git a/test/513-array-deopt/Android.bp b/test/513-array-deopt/Android.bp index 71c7ec09a6..2310b46af1 100644 --- a/test/513-array-deopt/Android.bp +++ b/test/513-array-deopt/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-513-array-deopt", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-513-array-deopt-expected"], } diff --git a/test/514-shifts/Android.bp b/test/514-shifts/Android.bp index 7c8aa3b97c..359e441947 100644 --- a/test/514-shifts/Android.bp +++ b/test/514-shifts/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-514-shifts", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-514-shifts-expected"], } diff --git a/test/519-bound-load-class/Android.bp b/test/519-bound-load-class/Android.bp index 5007694d24..b97502a5ad 100644 --- a/test/519-bound-load-class/Android.bp +++ b/test/519-bound-load-class/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-519-bound-load-class", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-519-bound-load-class-expected"], } diff --git a/test/521-checker-array-set-null/Android.bp b/test/521-checker-array-set-null/Android.bp index 7d500f793a..bfeb94b60f 100644 --- a/test/521-checker-array-set-null/Android.bp +++ b/test/521-checker-array-set-null/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-521-checker-array-set-null-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/521-regression-integer-field-set/Android.bp b/test/521-regression-integer-field-set/Android.bp index eaa7626d1a..a84031a466 100644 --- a/test/521-regression-integer-field-set/Android.bp +++ b/test/521-regression-integer-field-set/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-521-regression-integer-field-set", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-521-regression-integer-field-set-expected"], } diff --git a/test/524-boolean-simplifier-regression/Android.bp b/test/524-boolean-simplifier-regression/Android.bp index f0d81ff43a..31e4da677e 100644 --- a/test/524-boolean-simplifier-regression/Android.bp +++ b/test/524-boolean-simplifier-regression/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-524-boolean-simplifier-regression", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-524-boolean-simplifier-regression-expected"], } diff --git a/test/525-checker-arrays-fields1/Android.bp b/test/525-checker-arrays-fields1/Android.bp index 94b6dec64f..91f26eadc8 100644 --- a/test/525-checker-arrays-fields1/Android.bp +++ b/test/525-checker-arrays-fields1/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-525-checker-arrays-fields1-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/525-checker-arrays-fields2/Android.bp b/test/525-checker-arrays-fields2/Android.bp index 9fb4105408..aec6f3d86f 100644 --- a/test/525-checker-arrays-fields2/Android.bp +++ b/test/525-checker-arrays-fields2/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-525-checker-arrays-fields2-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/526-checker-caller-callee-regs/Android.bp b/test/526-checker-caller-callee-regs/Android.bp index a5d079d726..d91f2e00c8 100644 --- a/test/526-checker-caller-callee-regs/Android.bp +++ b/test/526-checker-caller-callee-regs/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-526-checker-caller-callee-regs", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-526-checker-caller-callee-regs-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/526-long-regalloc/Android.bp b/test/526-long-regalloc/Android.bp index dcbe3df7ff..4654558949 100644 --- a/test/526-long-regalloc/Android.bp +++ b/test/526-long-regalloc/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-526-long-regalloc", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-526-long-regalloc-expected"], } diff --git a/test/527-checker-array-access-simd/Android.bp b/test/527-checker-array-access-simd/Android.bp index f50b2befb8..bb17d0a2df 100644 --- a/test/527-checker-array-access-simd/Android.bp +++ b/test/527-checker-array-access-simd/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-527-checker-array-access-simd-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/527-checker-array-access-split/Android.bp b/test/527-checker-array-access-split/Android.bp index 0e0ccf3605..09b10b60e5 100644 --- a/test/527-checker-array-access-split/Android.bp +++ b/test/527-checker-array-access-split/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-527-checker-array-access-split-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/528-long-hint/Android.bp b/test/528-long-hint/Android.bp index 6884f9fa88..edcc1f86b0 100644 --- a/test/528-long-hint/Android.bp +++ b/test/528-long-hint/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-528-long-hint", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-528-long-hint-expected"], } diff --git a/test/529-long-split/Android.bp b/test/529-long-split/Android.bp index a88d1e53d1..8bc67a2840 100644 --- a/test/529-long-split/Android.bp +++ b/test/529-long-split/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-529-long-split", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-529-long-split-expected"], } diff --git a/test/530-checker-loops1/Android.bp b/test/530-checker-loops1/Android.bp index c9c58cccb7..f5572fb2dc 100644 --- a/test/530-checker-loops1/Android.bp +++ b/test/530-checker-loops1/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-530-checker-loops1-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/530-checker-loops2/Android.bp b/test/530-checker-loops2/Android.bp index 47e5823ba1..8d8fa3ae55 100644 --- a/test/530-checker-loops2/Android.bp +++ b/test/530-checker-loops2/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-530-checker-loops2-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/530-checker-loops3/Android.bp b/test/530-checker-loops3/Android.bp index 98c52fbfb4..2abe4a576b 100644 --- a/test/530-checker-loops3/Android.bp +++ b/test/530-checker-loops3/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-530-checker-loops3-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/530-checker-loops4/Android.bp b/test/530-checker-loops4/Android.bp index 6aa12f6d54..c89fc9c143 100644 --- a/test/530-checker-loops4/Android.bp +++ b/test/530-checker-loops4/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-530-checker-loops4-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/530-checker-loops5/Android.bp b/test/530-checker-loops5/Android.bp index cd4bb5592b..98b856f702 100644 --- a/test/530-checker-loops5/Android.bp +++ b/test/530-checker-loops5/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-530-checker-loops5-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/530-checker-lse-ctor-fences/Android.bp b/test/530-checker-lse-ctor-fences/Android.bp index cbd3fe236a..d84a66a86f 100644 --- a/test/530-checker-lse-ctor-fences/Android.bp +++ b/test/530-checker-lse-ctor-fences/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-530-checker-lse-ctor-fences-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/530-checker-lse-simd/Android.bp b/test/530-checker-lse-simd/Android.bp index c7c5c9d6b1..daf10664f4 100644 --- a/test/530-checker-lse-simd/Android.bp +++ b/test/530-checker-lse-simd/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-530-checker-lse-simd-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/530-checker-lse/Android.bp b/test/530-checker-lse/Android.bp index 86cfca8924..78edc59649 100644 --- a/test/530-checker-lse/Android.bp +++ b/test/530-checker-lse/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-530-checker-lse", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-530-checker-lse-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/530-checker-lse2/Android.bp b/test/530-checker-lse2/Android.bp index 84128c366a..fd0a483aca 100644 --- a/test/530-checker-lse2/Android.bp +++ b/test/530-checker-lse2/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-530-checker-lse2-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/530-instanceof-checkcast/Android.bp b/test/530-instanceof-checkcast/Android.bp index 041eb24279..077fda395b 100644 --- a/test/530-instanceof-checkcast/Android.bp +++ b/test/530-instanceof-checkcast/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-530-instanceof-checkcast", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-530-instanceof-checkcast-expected"], } diff --git a/test/530-regression-lse/Android.bp b/test/530-regression-lse/Android.bp index c230b01882..366ff331e2 100644 --- a/test/530-regression-lse/Android.bp +++ b/test/530-regression-lse/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-530-regression-lse", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-530-regression-lse-expected"], } diff --git a/test/532-checker-nonnull-arrayset/Android.bp b/test/532-checker-nonnull-arrayset/Android.bp index ec8e2a680e..28e67eb2c2 100644 --- a/test/532-checker-nonnull-arrayset/Android.bp +++ b/test/532-checker-nonnull-arrayset/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-532-checker-nonnull-arrayset-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/534-checker-bce-deoptimization/Android.bp b/test/534-checker-bce-deoptimization/Android.bp index 7eae475e67..f70803ef2e 100644 --- a/test/534-checker-bce-deoptimization/Android.bp +++ b/test/534-checker-bce-deoptimization/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-534-checker-bce-deoptimization-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/535-deopt-and-inlining/Android.bp b/test/535-deopt-and-inlining/Android.bp index 1495cb3e53..b85e6a5cdd 100644 --- a/test/535-deopt-and-inlining/Android.bp +++ b/test/535-deopt-and-inlining/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-535-deopt-and-inlining", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-535-deopt-and-inlining-expected"], } diff --git a/test/536-checker-intrinsic-optimization/Android.bp b/test/536-checker-intrinsic-optimization/Android.bp index 9b100fb02d..270170a8b9 100644 --- a/test/536-checker-intrinsic-optimization/Android.bp +++ b/test/536-checker-intrinsic-optimization/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-536-checker-intrinsic-optimization-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/537-checker-arraycopy/Android.bp b/test/537-checker-arraycopy/Android.bp index 6ae51a980e..19f454b235 100644 --- a/test/537-checker-arraycopy/Android.bp +++ b/test/537-checker-arraycopy/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-537-checker-arraycopy-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/537-checker-jump-over-jump/Android.bp b/test/537-checker-jump-over-jump/Android.bp index c679d56f8e..216a63a4b2 100644 --- a/test/537-checker-jump-over-jump/Android.bp +++ b/test/537-checker-jump-over-jump/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-537-checker-jump-over-jump-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/538-checker-embed-constants/Android.bp b/test/538-checker-embed-constants/Android.bp index 8e770b152b..8f8daa6386 100644 --- a/test/538-checker-embed-constants/Android.bp +++ b/test/538-checker-embed-constants/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-538-checker-embed-constants-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/540-checker-rtp-bug/Android.bp b/test/540-checker-rtp-bug/Android.bp index 7587a28be3..086a83fb09 100644 --- a/test/540-checker-rtp-bug/Android.bp +++ b/test/540-checker-rtp-bug/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-540-checker-rtp-bug-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/542-bitfield-rotates/Android.bp b/test/542-bitfield-rotates/Android.bp index ca0dec15f7..51ec13aa1b 100644 --- a/test/542-bitfield-rotates/Android.bp +++ b/test/542-bitfield-rotates/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-542-bitfield-rotates", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-542-bitfield-rotates-expected"], } diff --git a/test/542-inline-trycatch/Android.bp b/test/542-inline-trycatch/Android.bp index 127f65e5a7..7c2eef7e24 100644 --- a/test/542-inline-trycatch/Android.bp +++ b/test/542-inline-trycatch/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-542-inline-trycatch", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-542-inline-trycatch-expected"], } diff --git a/test/542-unresolved-access-check/Android.bp b/test/542-unresolved-access-check/Android.bp index 4d5efc3ead..75910196ff 100644 --- a/test/542-unresolved-access-check/Android.bp +++ b/test/542-unresolved-access-check/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-542-unresolved-access-check", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-542-unresolved-access-check-expected"], } diff --git a/test/545-tracing-and-jit/Android.bp b/test/545-tracing-and-jit/Android.bp index b8a016ca69..dc48e565c8 100644 --- a/test/545-tracing-and-jit/Android.bp +++ b/test/545-tracing-and-jit/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-545-tracing-and-jit", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-545-tracing-and-jit-expected"], } diff --git a/test/548-checker-inlining-and-dce/Android.bp b/test/548-checker-inlining-and-dce/Android.bp index 5b4330ba7a..5d103298db 100644 --- a/test/548-checker-inlining-and-dce/Android.bp +++ b/test/548-checker-inlining-and-dce/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-548-checker-inlining-and-dce-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/549-checker-types-merge/Android.bp b/test/549-checker-types-merge/Android.bp index 3e87756dfd..1735c463ac 100644 --- a/test/549-checker-types-merge/Android.bp +++ b/test/549-checker-types-merge/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-549-checker-types-merge-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/550-checker-multiply-accumulate/Android.bp b/test/550-checker-multiply-accumulate/Android.bp index c86d0b551f..5b125222b9 100644 --- a/test/550-checker-multiply-accumulate/Android.bp +++ b/test/550-checker-multiply-accumulate/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-550-checker-multiply-accumulate-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/550-new-instance-clinit/Android.bp b/test/550-new-instance-clinit/Android.bp index 89eb2ef6e9..6892cba0bc 100644 --- a/test/550-new-instance-clinit/Android.bp +++ b/test/550-new-instance-clinit/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-550-new-instance-clinit", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-550-new-instance-clinit-expected"], } diff --git a/test/551-checker-clinit/Android.bp b/test/551-checker-clinit/Android.bp index 7abb9abb88..6098755097 100644 --- a/test/551-checker-clinit/Android.bp +++ b/test/551-checker-clinit/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-551-checker-clinit-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/551-checker-shifter-operand/Android.bp b/test/551-checker-shifter-operand/Android.bp index 8f98b9b7b9..6d1147862d 100644 --- a/test/551-checker-shifter-operand/Android.bp +++ b/test/551-checker-shifter-operand/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-551-checker-shifter-operand", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-551-checker-shifter-operand-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/551-implicit-null-checks/Android.bp b/test/551-implicit-null-checks/Android.bp index a995002a19..3eac7844a3 100644 --- a/test/551-implicit-null-checks/Android.bp +++ b/test/551-implicit-null-checks/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-551-implicit-null-checks", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-551-implicit-null-checks-expected"], } diff --git a/test/552-checker-sharpening/Android.bp b/test/552-checker-sharpening/Android.bp index 3c5340d5ab..d02a611ade 100644 --- a/test/552-checker-sharpening/Android.bp +++ b/test/552-checker-sharpening/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-552-checker-sharpening", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-552-checker-sharpening-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/552-checker-x86-avx2-bit-manipulation/Android.bp b/test/552-checker-x86-avx2-bit-manipulation/Android.bp index caa1df373a..a7261a2a9b 100644 --- a/test/552-checker-x86-avx2-bit-manipulation/Android.bp +++ b/test/552-checker-x86-avx2-bit-manipulation/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-552-checker-x86-avx2-bit-manipulation-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/554-checker-rtp-checkcast/Android.bp b/test/554-checker-rtp-checkcast/Android.bp index cc3dc24917..6dc0a183d2 100644 --- a/test/554-checker-rtp-checkcast/Android.bp +++ b/test/554-checker-rtp-checkcast/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-554-checker-rtp-checkcast-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/555-UnsafeGetLong-regression/Android.bp b/test/555-UnsafeGetLong-regression/Android.bp index 807cb4bdcd..83c5ee6c4b 100644 --- a/test/555-UnsafeGetLong-regression/Android.bp +++ b/test/555-UnsafeGetLong-regression/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-555-UnsafeGetLong-regression", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-555-UnsafeGetLong-regression-expected"], } diff --git a/test/557-checker-instruct-simplifier-ror/Android.bp b/test/557-checker-instruct-simplifier-ror/Android.bp index b5a62a1f42..2a38fd001a 100644 --- a/test/557-checker-instruct-simplifier-ror/Android.bp +++ b/test/557-checker-instruct-simplifier-ror/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-557-checker-instruct-simplifier-ror-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/558-switch/Android.bp b/test/558-switch/Android.bp index 29d32044b0..78f5fe69b2 100644 --- a/test/558-switch/Android.bp +++ b/test/558-switch/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-558-switch", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-558-switch-expected"], } diff --git a/test/559-bce-ssa/Android.bp b/test/559-bce-ssa/Android.bp index cad8b2259d..f806827349 100644 --- a/test/559-bce-ssa/Android.bp +++ b/test/559-bce-ssa/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-559-bce-ssa", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-559-bce-ssa-expected"], } diff --git a/test/559-checker-rtp-ifnotnull/Android.bp b/test/559-checker-rtp-ifnotnull/Android.bp index 16b6a9d57f..3ba9d3bca7 100644 --- a/test/559-checker-rtp-ifnotnull/Android.bp +++ b/test/559-checker-rtp-ifnotnull/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-559-checker-rtp-ifnotnull-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/560-packed-switch/Android.bp b/test/560-packed-switch/Android.bp index ae938a4161..1a14037c62 100644 --- a/test/560-packed-switch/Android.bp +++ b/test/560-packed-switch/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-560-packed-switch", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-560-packed-switch-expected"], } diff --git a/test/561-divrem/Android.bp b/test/561-divrem/Android.bp index c65d940497..d168c7173a 100644 --- a/test/561-divrem/Android.bp +++ b/test/561-divrem/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-561-divrem", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-561-divrem-expected"], } diff --git a/test/561-shared-slowpaths/Android.bp b/test/561-shared-slowpaths/Android.bp index cb89d8a291..be070ab516 100644 --- a/test/561-shared-slowpaths/Android.bp +++ b/test/561-shared-slowpaths/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-561-shared-slowpaths", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-561-shared-slowpaths-expected"], } diff --git a/test/562-bce-preheader/Android.bp b/test/562-bce-preheader/Android.bp index b0d1710a8e..13c0f368bd 100644 --- a/test/562-bce-preheader/Android.bp +++ b/test/562-bce-preheader/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-562-bce-preheader", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-562-bce-preheader-expected"], } diff --git a/test/562-checker-no-intermediate/Android.bp b/test/562-checker-no-intermediate/Android.bp index a3aa86cc94..b0c2e3c401 100644 --- a/test/562-checker-no-intermediate/Android.bp +++ b/test/562-checker-no-intermediate/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-562-checker-no-intermediate", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-562-checker-no-intermediate-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/563-checker-invoke-super/Android.bp b/test/563-checker-invoke-super/Android.bp index 36de30ba09..2963269091 100644 --- a/test/563-checker-invoke-super/Android.bp +++ b/test/563-checker-invoke-super/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-563-checker-invoke-super-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/564-checker-bitcount/Android.bp b/test/564-checker-bitcount/Android.bp index fdda5d460e..afd0915601 100644 --- a/test/564-checker-bitcount/Android.bp +++ b/test/564-checker-bitcount/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-564-checker-bitcount-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/564-checker-inline-loop/Android.bp b/test/564-checker-inline-loop/Android.bp index c02c1d8ceb..cd5cac14c9 100644 --- a/test/564-checker-inline-loop/Android.bp +++ b/test/564-checker-inline-loop/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-564-checker-inline-loop-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/564-checker-negbitwise/Android.bp b/test/564-checker-negbitwise/Android.bp index 06abd31558..872e5e9144 100644 --- a/test/564-checker-negbitwise/Android.bp +++ b/test/564-checker-negbitwise/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-564-checker-negbitwise-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/565-checker-condition-liveness/Android.bp b/test/565-checker-condition-liveness/Android.bp index 107faa6991..4cd4aecede 100644 --- a/test/565-checker-condition-liveness/Android.bp +++ b/test/565-checker-condition-liveness/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-565-checker-condition-liveness-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/566-checker-codegen-select/Android.bp b/test/566-checker-codegen-select/Android.bp index a7d0deeb13..b17411763e 100644 --- a/test/566-checker-codegen-select/Android.bp +++ b/test/566-checker-codegen-select/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-566-checker-codegen-select-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/566-polymorphic-inlining/Android.bp b/test/566-polymorphic-inlining/Android.bp index ce26ce4217..20f99160be 100644 --- a/test/566-polymorphic-inlining/Android.bp +++ b/test/566-polymorphic-inlining/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-566-polymorphic-inlining", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-566-polymorphic-inlining-expected"], } diff --git a/test/567-checker-builder-intrinsics/Android.bp b/test/567-checker-builder-intrinsics/Android.bp index 06c456b51c..c3cbf27ba6 100644 --- a/test/567-checker-builder-intrinsics/Android.bp +++ b/test/567-checker-builder-intrinsics/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-567-checker-builder-intrinsics-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/568-checker-onebit/Android.bp b/test/568-checker-onebit/Android.bp index ca1921e8dd..be73bc118c 100644 --- a/test/568-checker-onebit/Android.bp +++ b/test/568-checker-onebit/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-568-checker-onebit-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/570-checker-select/Android.bp b/test/570-checker-select/Android.bp index 0fb2ea0746..4b9a58ee14 100644 --- a/test/570-checker-select/Android.bp +++ b/test/570-checker-select/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-570-checker-select-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/572-checker-array-get-regression/Android.bp b/test/572-checker-array-get-regression/Android.bp index 0bab5a6a3f..68d561e919 100644 --- a/test/572-checker-array-get-regression/Android.bp +++ b/test/572-checker-array-get-regression/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-572-checker-array-get-regression-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/573-checker-checkcast-regression/Android.bp b/test/573-checker-checkcast-regression/Android.bp index 8548ca3455..35d41aae3e 100644 --- a/test/573-checker-checkcast-regression/Android.bp +++ b/test/573-checker-checkcast-regression/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-573-checker-checkcast-regression-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/576-polymorphic-inlining/Android.bp b/test/576-polymorphic-inlining/Android.bp index fb51f7f6f2..ec925c5781 100644 --- a/test/576-polymorphic-inlining/Android.bp +++ b/test/576-polymorphic-inlining/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-576-polymorphic-inlining", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-576-polymorphic-inlining-expected"], } diff --git a/test/577-checker-fp2int/Android.bp b/test/577-checker-fp2int/Android.bp index e22faa7f60..09c9d8098f 100644 --- a/test/577-checker-fp2int/Android.bp +++ b/test/577-checker-fp2int/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-577-checker-fp2int-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/578-bce-visit/Android.bp b/test/578-bce-visit/Android.bp index 89f29aa668..59034011d3 100644 --- a/test/578-bce-visit/Android.bp +++ b/test/578-bce-visit/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-578-bce-visit", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-578-bce-visit-expected"], } diff --git a/test/578-polymorphic-inlining/Android.bp b/test/578-polymorphic-inlining/Android.bp index 699ad74fb7..8ab7ac0e69 100644 --- a/test/578-polymorphic-inlining/Android.bp +++ b/test/578-polymorphic-inlining/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-578-polymorphic-inlining", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-578-polymorphic-inlining-expected"], } diff --git a/test/579-inline-infinite/Android.bp b/test/579-inline-infinite/Android.bp index b677814939..78aa062b4f 100644 --- a/test/579-inline-infinite/Android.bp +++ b/test/579-inline-infinite/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-579-inline-infinite", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-579-inline-infinite-expected"], } diff --git a/test/580-checker-round/Android.bp b/test/580-checker-round/Android.bp index 31ef1d0491..a81edd64c6 100644 --- a/test/580-checker-round/Android.bp +++ b/test/580-checker-round/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-580-checker-round-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/580-crc32/Android.bp b/test/580-crc32/Android.bp index 01b25f903c..dfef91d14d 100644 --- a/test/580-crc32/Android.bp +++ b/test/580-crc32/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-580-crc32", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-580-crc32-expected"], } diff --git a/test/581-rtp/Android.bp b/test/581-rtp/Android.bp index fd9f58f6fe..51f830a6b3 100644 --- a/test/581-rtp/Android.bp +++ b/test/581-rtp/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-581-rtp", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-581-rtp-expected"], } diff --git a/test/582-checker-bce-length/Android.bp b/test/582-checker-bce-length/Android.bp index b9759fe56a..ea8275ae84 100644 --- a/test/582-checker-bce-length/Android.bp +++ b/test/582-checker-bce-length/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-582-checker-bce-length-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/583-checker-zero/Android.bp b/test/583-checker-zero/Android.bp index 83825fda4d..d599c21c55 100644 --- a/test/583-checker-zero/Android.bp +++ b/test/583-checker-zero/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-583-checker-zero-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/584-checker-div-bool/Android.bp b/test/584-checker-div-bool/Android.bp index 2b5e1cdc85..381ab01ba0 100644 --- a/test/584-checker-div-bool/Android.bp +++ b/test/584-checker-div-bool/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-584-checker-div-bool-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/589-super-imt/Android.bp b/test/589-super-imt/Android.bp index 485b236a0c..a2235e904f 100644 --- a/test/589-super-imt/Android.bp +++ b/test/589-super-imt/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-589-super-imt", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-589-super-imt-expected"], } diff --git a/test/590-checker-arr-set-null-regression/Android.bp b/test/590-checker-arr-set-null-regression/Android.bp index 4beae2097f..0b33cdc05a 100644 --- a/test/590-checker-arr-set-null-regression/Android.bp +++ b/test/590-checker-arr-set-null-regression/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-590-checker-arr-set-null-regression-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/591-checker-regression-dead-loop/Android.bp b/test/591-checker-regression-dead-loop/Android.bp index 03f5723736..979d099ba4 100644 --- a/test/591-checker-regression-dead-loop/Android.bp +++ b/test/591-checker-regression-dead-loop/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-591-checker-regression-dead-loop-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/593-checker-long-2-float-regression/Android.bp b/test/593-checker-long-2-float-regression/Android.bp index 641090fe40..8d2b591492 100644 --- a/test/593-checker-long-2-float-regression/Android.bp +++ b/test/593-checker-long-2-float-regression/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-593-checker-long-2-float-regression-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/594-checker-array-alias/Android.bp b/test/594-checker-array-alias/Android.bp index acde6621cf..b2c342789d 100644 --- a/test/594-checker-array-alias/Android.bp +++ b/test/594-checker-array-alias/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-594-checker-array-alias-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/594-load-string-regression/Android.bp b/test/594-load-string-regression/Android.bp index 6c0378f8e7..674a81678f 100644 --- a/test/594-load-string-regression/Android.bp +++ b/test/594-load-string-regression/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-594-load-string-regression", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-594-load-string-regression-expected"], } diff --git a/test/595-profile-saving/Android.bp b/test/595-profile-saving/Android.bp index 7794473409..f8f233b492 100644 --- a/test/595-profile-saving/Android.bp +++ b/test/595-profile-saving/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-595-profile-saving", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-595-profile-saving-expected"], } diff --git a/test/597-deopt-busy-loop/Android.bp b/test/597-deopt-busy-loop/Android.bp index 0f8cb97aea..9768f123ee 100644 --- a/test/597-deopt-busy-loop/Android.bp +++ b/test/597-deopt-busy-loop/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-597-deopt-busy-loop", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-597-deopt-busy-loop-expected"], } diff --git a/test/597-deopt-invoke-stub/Android.bp b/test/597-deopt-invoke-stub/Android.bp index 9629ae7f29..02efbe17a2 100644 --- a/test/597-deopt-invoke-stub/Android.bp +++ b/test/597-deopt-invoke-stub/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-597-deopt-invoke-stub", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-597-deopt-invoke-stub-expected"], } diff --git a/test/597-deopt-new-string/Android.bp b/test/597-deopt-new-string/Android.bp index ad677fc9d3..0b83630df7 100644 --- a/test/597-deopt-new-string/Android.bp +++ b/test/597-deopt-new-string/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-597-deopt-new-string", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-597-deopt-new-string-expected"], } diff --git a/test/602-deoptimizeable/Android.bp b/test/602-deoptimizeable/Android.bp index d8b15d1b7e..322caee5a0 100644 --- a/test/602-deoptimizeable/Android.bp +++ b/test/602-deoptimizeable/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-602-deoptimizeable", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-602-deoptimizeable-expected"], } diff --git a/test/603-checker-instanceof/Android.bp b/test/603-checker-instanceof/Android.bp index e996003609..cdab711f5a 100644 --- a/test/603-checker-instanceof/Android.bp +++ b/test/603-checker-instanceof/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-603-checker-instanceof-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/604-hot-static-interface/Android.bp b/test/604-hot-static-interface/Android.bp index d638884d01..2eac8a67ba 100644 --- a/test/604-hot-static-interface/Android.bp +++ b/test/604-hot-static-interface/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-604-hot-static-interface", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-604-hot-static-interface-expected"], } diff --git a/test/605-new-string-from-bytes/Android.bp b/test/605-new-string-from-bytes/Android.bp index 9bef370fdc..bb3fb80d05 100644 --- a/test/605-new-string-from-bytes/Android.bp +++ b/test/605-new-string-from-bytes/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-605-new-string-from-bytes", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-605-new-string-from-bytes-expected"], } diff --git a/test/607-daemon-stress/Android.bp b/test/607-daemon-stress/Android.bp index 8b27c501a2..4b60c9a836 100644 --- a/test/607-daemon-stress/Android.bp +++ b/test/607-daemon-stress/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-607-daemon-stress", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-607-daemon-stress-expected"], } diff --git a/test/609-checker-inline-interface/Android.bp b/test/609-checker-inline-interface/Android.bp index d16d87e712..192888456c 100644 --- a/test/609-checker-inline-interface/Android.bp +++ b/test/609-checker-inline-interface/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-609-checker-inline-interface-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/609-checker-x86-bounds-check/Android.bp b/test/609-checker-x86-bounds-check/Android.bp index 8aa790da1b..3d3b412e7f 100644 --- a/test/609-checker-x86-bounds-check/Android.bp +++ b/test/609-checker-x86-bounds-check/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-609-checker-x86-bounds-check-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/610-arraycopy/Android.bp b/test/610-arraycopy/Android.bp index 06336ce538..1415061435 100644 --- a/test/610-arraycopy/Android.bp +++ b/test/610-arraycopy/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-610-arraycopy", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-610-arraycopy-expected"], } diff --git a/test/611-checker-simplify-if/Android.bp b/test/611-checker-simplify-if/Android.bp index fcd8e49d9a..af75af6d71 100644 --- a/test/611-checker-simplify-if/Android.bp +++ b/test/611-checker-simplify-if/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-611-checker-simplify-if-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/614-checker-dump-constant-location/Android.bp b/test/614-checker-dump-constant-location/Android.bp index 9b236cca76..aa1a6fec60 100644 --- a/test/614-checker-dump-constant-location/Android.bp +++ b/test/614-checker-dump-constant-location/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-614-checker-dump-constant-location-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/615-checker-arm64-store-zero/Android.bp b/test/615-checker-arm64-store-zero/Android.bp index a6825cb335..88cff5f49f 100644 --- a/test/615-checker-arm64-store-zero/Android.bp +++ b/test/615-checker-arm64-store-zero/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-615-checker-arm64-store-zero-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/616-cha-abstract/Android.bp b/test/616-cha-abstract/Android.bp index 1ea0ee7423..dece12fb03 100644 --- a/test/616-cha-abstract/Android.bp +++ b/test/616-cha-abstract/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-616-cha-abstract", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-616-cha-abstract-expected"], } diff --git a/test/616-cha-interface/Android.bp b/test/616-cha-interface/Android.bp index 32a5733035..7b25f024a6 100644 --- a/test/616-cha-interface/Android.bp +++ b/test/616-cha-interface/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-616-cha-interface", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-616-cha-interface-expected"], } diff --git a/test/616-cha-miranda/Android.bp b/test/616-cha-miranda/Android.bp index a16c313205..04554bb137 100644 --- a/test/616-cha-miranda/Android.bp +++ b/test/616-cha-miranda/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-616-cha-miranda", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-616-cha-miranda-expected"], } diff --git a/test/616-cha-native/Android.bp b/test/616-cha-native/Android.bp index b299c67075..635f2bb250 100644 --- a/test/616-cha-native/Android.bp +++ b/test/616-cha-native/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-616-cha-native", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-616-cha-native-expected"], } diff --git a/test/616-cha-regression-proxy-method/Android.bp b/test/616-cha-regression-proxy-method/Android.bp index 480b0c2063..2cf8807d7a 100644 --- a/test/616-cha-regression-proxy-method/Android.bp +++ b/test/616-cha-regression-proxy-method/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-616-cha-regression-proxy-method", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-616-cha-regression-proxy-method-expected"], } diff --git a/test/616-cha/Android.bp b/test/616-cha/Android.bp index 871cc973f1..110135b594 100644 --- a/test/616-cha/Android.bp +++ b/test/616-cha/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-616-cha", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-616-cha-expected"], } diff --git a/test/617-clinit-oome/Android.bp b/test/617-clinit-oome/Android.bp index 300ed5d2a1..d60a39ca2f 100644 --- a/test/617-clinit-oome/Android.bp +++ b/test/617-clinit-oome/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-617-clinit-oome", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-617-clinit-oome-expected"], } diff --git a/test/618-checker-induction/Android.bp b/test/618-checker-induction/Android.bp index 193eb03328..e126d37fbb 100644 --- a/test/618-checker-induction/Android.bp +++ b/test/618-checker-induction/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-618-checker-induction-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/619-checker-current-method/Android.bp b/test/619-checker-current-method/Android.bp index 1d54575d11..40108a2515 100644 --- a/test/619-checker-current-method/Android.bp +++ b/test/619-checker-current-method/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-619-checker-current-method-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/620-checker-bce-intrinsics/Android.bp b/test/620-checker-bce-intrinsics/Android.bp index 3536961808..012ac7f11f 100644 --- a/test/620-checker-bce-intrinsics/Android.bp +++ b/test/620-checker-bce-intrinsics/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-620-checker-bce-intrinsics-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/622-checker-bce-regressions/Android.bp b/test/622-checker-bce-regressions/Android.bp index 5984ebe2d1..8a9823fedd 100644 --- a/test/622-checker-bce-regressions/Android.bp +++ b/test/622-checker-bce-regressions/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-622-checker-bce-regressions-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/623-checker-loop-regressions/Android.bp b/test/623-checker-loop-regressions/Android.bp index 5c0b6af346..7098e13b76 100644 --- a/test/623-checker-loop-regressions/Android.bp +++ b/test/623-checker-loop-regressions/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-623-checker-loop-regressions", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-623-checker-loop-regressions-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/625-checker-licm-regressions/Android.bp b/test/625-checker-licm-regressions/Android.bp index 566c94efb4..ea71b3e3e6 100644 --- a/test/625-checker-licm-regressions/Android.bp +++ b/test/625-checker-licm-regressions/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-625-checker-licm-regressions-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/626-set-resolved-string/Android.bp b/test/626-set-resolved-string/Android.bp index d455eb1eef..a367111c29 100644 --- a/test/626-set-resolved-string/Android.bp +++ b/test/626-set-resolved-string/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-626-set-resolved-string", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-626-set-resolved-string-expected"], } diff --git a/test/627-checker-unroll/Android.bp b/test/627-checker-unroll/Android.bp index 0a55e7e111..c583cb4e5f 100644 --- a/test/627-checker-unroll/Android.bp +++ b/test/627-checker-unroll/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-627-checker-unroll-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/628-vdex/Android.bp b/test/628-vdex/Android.bp index 3c80558d49..8a0dc060bb 100644 --- a/test/628-vdex/Android.bp +++ b/test/628-vdex/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-628-vdex", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-628-vdex-expected"], } diff --git a/test/629-vdex-speed/Android.bp b/test/629-vdex-speed/Android.bp index 93256ce037..aa1bb0887e 100644 --- a/test/629-vdex-speed/Android.bp +++ b/test/629-vdex-speed/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-629-vdex-speed", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-629-vdex-speed-expected"], } diff --git a/test/631-checker-get-class/Android.bp b/test/631-checker-get-class/Android.bp index edfd3b1c72..72263363ec 100644 --- a/test/631-checker-get-class/Android.bp +++ b/test/631-checker-get-class/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-631-checker-get-class-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/632-checker-char-at-bounds/Android.bp b/test/632-checker-char-at-bounds/Android.bp index 34bc0388d6..96831f2024 100644 --- a/test/632-checker-char-at-bounds/Android.bp +++ b/test/632-checker-char-at-bounds/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-632-checker-char-at-bounds-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/635-checker-arm64-volatile-load-cc/Android.bp b/test/635-checker-arm64-volatile-load-cc/Android.bp index 78bee1321d..c193565603 100644 --- a/test/635-checker-arm64-volatile-load-cc/Android.bp +++ b/test/635-checker-arm64-volatile-load-cc/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-635-checker-arm64-volatile-load-cc-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/636-arm64-veneer-pool/Android.bp b/test/636-arm64-veneer-pool/Android.bp index 2bd90f493b..10d44e391e 100644 --- a/test/636-arm64-veneer-pool/Android.bp +++ b/test/636-arm64-veneer-pool/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-636-arm64-veneer-pool", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-636-arm64-veneer-pool-expected"], } diff --git a/test/637-checker-throw-inline/Android.bp b/test/637-checker-throw-inline/Android.bp index c8c37e8391..3a71451cc1 100644 --- a/test/637-checker-throw-inline/Android.bp +++ b/test/637-checker-throw-inline/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-637-checker-throw-inline-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/638-checker-inline-cache-intrinsic/Android.bp b/test/638-checker-inline-cache-intrinsic/Android.bp index 4236c210a0..a1a812d1cb 100644 --- a/test/638-checker-inline-cache-intrinsic/Android.bp +++ b/test/638-checker-inline-cache-intrinsic/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-638-checker-inline-cache-intrinsic", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-638-checker-inline-cache-intrinsic-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/639-checker-code-sinking/Android.bp b/test/639-checker-code-sinking/Android.bp index d466919f1a..2e35f9d804 100644 --- a/test/639-checker-code-sinking/Android.bp +++ b/test/639-checker-code-sinking/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-639-checker-code-sinking", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-639-checker-code-sinking-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/640-checker-boolean-simd/Android.bp b/test/640-checker-boolean-simd/Android.bp index 3753ed1f2e..cf2d2f0e9b 100644 --- a/test/640-checker-boolean-simd/Android.bp +++ b/test/640-checker-boolean-simd/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-640-checker-boolean-simd-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/640-checker-integer-valueof/Android.bp b/test/640-checker-integer-valueof/Android.bp index c1c79c9a68..97a15ac5b0 100644 --- a/test/640-checker-integer-valueof/Android.bp +++ b/test/640-checker-integer-valueof/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-640-checker-integer-valueof-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/640-checker-simd/Android.bp b/test/640-checker-simd/Android.bp index edb9bfe22c..ae82368eeb 100644 --- a/test/640-checker-simd/Android.bp +++ b/test/640-checker-simd/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-640-checker-simd-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/641-checker-arraycopy/Android.bp b/test/641-checker-arraycopy/Android.bp index ff4accbfc0..600fbcf4a9 100644 --- a/test/641-checker-arraycopy/Android.bp +++ b/test/641-checker-arraycopy/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-641-checker-arraycopy-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/641-iterations/Android.bp b/test/641-iterations/Android.bp index b955230fc0..1de9a8fa51 100644 --- a/test/641-iterations/Android.bp +++ b/test/641-iterations/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-641-iterations", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-641-iterations-expected"], } diff --git a/test/642-fp-callees/Android.bp b/test/642-fp-callees/Android.bp index 3d952fbd66..1af21cac3a 100644 --- a/test/642-fp-callees/Android.bp +++ b/test/642-fp-callees/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-642-fp-callees", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-642-fp-callees-expected"], } diff --git a/test/643-checker-bogus-ic/Android.bp b/test/643-checker-bogus-ic/Android.bp index 8eb0fbc822..17656f0889 100644 --- a/test/643-checker-bogus-ic/Android.bp +++ b/test/643-checker-bogus-ic/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-643-checker-bogus-ic-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/645-checker-abs-simd/Android.bp b/test/645-checker-abs-simd/Android.bp index 9f133cd3c7..1cfb950748 100644 --- a/test/645-checker-abs-simd/Android.bp +++ b/test/645-checker-abs-simd/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-645-checker-abs-simd-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/646-checker-arraycopy-large-cst-pos/Android.bp b/test/646-checker-arraycopy-large-cst-pos/Android.bp index eb9a325c04..ea7481b8c6 100644 --- a/test/646-checker-arraycopy-large-cst-pos/Android.bp +++ b/test/646-checker-arraycopy-large-cst-pos/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-646-checker-arraycopy-large-cst-pos-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/646-checker-long-const-to-int/Android.bp b/test/646-checker-long-const-to-int/Android.bp index a2b1005681..6ba7740cbb 100644 --- a/test/646-checker-long-const-to-int/Android.bp +++ b/test/646-checker-long-const-to-int/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-646-checker-long-const-to-int-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/646-checker-simd-hadd/Android.bp b/test/646-checker-simd-hadd/Android.bp index 7666a54a7f..1fc42988d6 100644 --- a/test/646-checker-simd-hadd/Android.bp +++ b/test/646-checker-simd-hadd/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-646-checker-simd-hadd-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/647-jni-get-field-id/Android.bp b/test/647-jni-get-field-id/Android.bp index 7efa004bb0..482aa3966f 100644 --- a/test/647-jni-get-field-id/Android.bp +++ b/test/647-jni-get-field-id/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-647-jni-get-field-id", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-647-jni-get-field-id-expected"], } diff --git a/test/650-checker-inline-access-thunks/Android.bp b/test/650-checker-inline-access-thunks/Android.bp index 803011e90a..3e356351ff 100644 --- a/test/650-checker-inline-access-thunks/Android.bp +++ b/test/650-checker-inline-access-thunks/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-650-checker-inline-access-thunks-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/652-deopt-intrinsic/Android.bp b/test/652-deopt-intrinsic/Android.bp index bc1e79a069..30e891a676 100644 --- a/test/652-deopt-intrinsic/Android.bp +++ b/test/652-deopt-intrinsic/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-652-deopt-intrinsic", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-652-deopt-intrinsic-expected"], } diff --git a/test/654-checker-periodic/Android.bp b/test/654-checker-periodic/Android.bp index 2870e71a1a..6ab0be0ca3 100644 --- a/test/654-checker-periodic/Android.bp +++ b/test/654-checker-periodic/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-654-checker-periodic-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/655-checker-simd-arm-opt/Android.bp b/test/655-checker-simd-arm-opt/Android.bp index d13def18b5..e6b3aa83b2 100644 --- a/test/655-checker-simd-arm-opt/Android.bp +++ b/test/655-checker-simd-arm-opt/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-655-checker-simd-arm-opt-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/655-jit-clinit/Android.bp b/test/655-jit-clinit/Android.bp index a9a5354dae..8dbc7e8c3b 100644 --- a/test/655-jit-clinit/Android.bp +++ b/test/655-jit-clinit/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-655-jit-clinit", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-655-jit-clinit-expected"], } diff --git a/test/656-checker-simd-opt/Android.bp b/test/656-checker-simd-opt/Android.bp index 6bc7410739..7429759d74 100644 --- a/test/656-checker-simd-opt/Android.bp +++ b/test/656-checker-simd-opt/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-656-checker-simd-opt-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/656-loop-deopt/Android.bp b/test/656-loop-deopt/Android.bp index 032855a16a..a5dc8167ec 100644 --- a/test/656-loop-deopt/Android.bp +++ b/test/656-loop-deopt/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-656-loop-deopt", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-656-loop-deopt-expected"], } diff --git a/test/657-branches/Android.bp b/test/657-branches/Android.bp index 55190f913b..e384db8b32 100644 --- a/test/657-branches/Android.bp +++ b/test/657-branches/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-657-branches", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-657-branches-expected"], } diff --git a/test/658-fp-read-barrier/Android.bp b/test/658-fp-read-barrier/Android.bp index 1bf9a0ef16..e93878fefb 100644 --- a/test/658-fp-read-barrier/Android.bp +++ b/test/658-fp-read-barrier/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-658-fp-read-barrier", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-658-fp-read-barrier-expected"], } diff --git a/test/660-checker-sad/Android.bp b/test/660-checker-sad/Android.bp index 9e83ea671b..4045182855 100644 --- a/test/660-checker-sad/Android.bp +++ b/test/660-checker-sad/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-660-checker-sad-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/660-checker-simd-sad/Android.bp b/test/660-checker-simd-sad/Android.bp index 629ae97c5a..9b15b52b83 100644 --- a/test/660-checker-simd-sad/Android.bp +++ b/test/660-checker-simd-sad/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-660-checker-simd-sad-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/660-clinit/Android.bp b/test/660-clinit/Android.bp index 32cb7a5ae7..2e325962fa 100644 --- a/test/660-clinit/Android.bp +++ b/test/660-clinit/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-660-clinit", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-660-clinit-expected"], } diff --git a/test/661-checker-simd-reduc/Android.bp b/test/661-checker-simd-reduc/Android.bp index 0ad253c509..7be8f9e172 100644 --- a/test/661-checker-simd-reduc/Android.bp +++ b/test/661-checker-simd-reduc/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-661-checker-simd-reduc-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/661-oat-writer-layout/Android.bp b/test/661-oat-writer-layout/Android.bp index b3003b7add..fecfd37172 100644 --- a/test/661-oat-writer-layout/Android.bp +++ b/test/661-oat-writer-layout/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-661-oat-writer-layout", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-661-oat-writer-layout-expected"], } diff --git a/test/662-regression-alias/Android.bp b/test/662-regression-alias/Android.bp index d96f5eda95..a2ce3a24c2 100644 --- a/test/662-regression-alias/Android.bp +++ b/test/662-regression-alias/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-662-regression-alias", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-662-regression-alias-expected"], } diff --git a/test/664-aget-verifier/Android.bp b/test/664-aget-verifier/Android.bp index c8b577d938..a4ae4ea221 100644 --- a/test/664-aget-verifier/Android.bp +++ b/test/664-aget-verifier/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-664-aget-verifier", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-664-aget-verifier-expected"], } diff --git a/test/665-checker-simd-zero/Android.bp b/test/665-checker-simd-zero/Android.bp index 69d7279f0b..99d8a4c5d8 100644 --- a/test/665-checker-simd-zero/Android.bp +++ b/test/665-checker-simd-zero/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-665-checker-simd-zero-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/666-dex-cache-itf/Android.bp b/test/666-dex-cache-itf/Android.bp index 4445f33684..da3105face 100644 --- a/test/666-dex-cache-itf/Android.bp +++ b/test/666-dex-cache-itf/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-666-dex-cache-itf", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-666-dex-cache-itf-expected"], } diff --git a/test/667-checker-simd-alignment/Android.bp b/test/667-checker-simd-alignment/Android.bp index 7b6fc0fafd..195cb99ccc 100644 --- a/test/667-checker-simd-alignment/Android.bp +++ b/test/667-checker-simd-alignment/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-667-checker-simd-alignment-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/667-jit-jni-stub/Android.bp b/test/667-jit-jni-stub/Android.bp index b67d69631e..c8edf82190 100644 --- a/test/667-jit-jni-stub/Android.bp +++ b/test/667-jit-jni-stub/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-667-jit-jni-stub", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-667-jit-jni-stub-expected"], } diff --git a/test/667-out-of-bounds/Android.bp b/test/667-out-of-bounds/Android.bp index be1b944f57..b163fd97e0 100644 --- a/test/667-out-of-bounds/Android.bp +++ b/test/667-out-of-bounds/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-667-out-of-bounds", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-667-out-of-bounds-expected"], } diff --git a/test/669-checker-break/Android.bp b/test/669-checker-break/Android.bp index 248cfa8984..e6ac50c642 100644 --- a/test/669-checker-break/Android.bp +++ b/test/669-checker-break/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-669-checker-break-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/671-npe-field-opts/Android.bp b/test/671-npe-field-opts/Android.bp index 964e496d69..ca0545f0da 100644 --- a/test/671-npe-field-opts/Android.bp +++ b/test/671-npe-field-opts/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-671-npe-field-opts", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-671-npe-field-opts-expected"], } diff --git a/test/672-checker-throw-method/Android.bp b/test/672-checker-throw-method/Android.bp index eb5960bf7e..64b16ccf23 100644 --- a/test/672-checker-throw-method/Android.bp +++ b/test/672-checker-throw-method/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-672-checker-throw-method-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/673-checker-throw-vmethod/Android.bp b/test/673-checker-throw-vmethod/Android.bp index 3785f0703b..681f0a022c 100644 --- a/test/673-checker-throw-vmethod/Android.bp +++ b/test/673-checker-throw-vmethod/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-673-checker-throw-vmethod-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/674-HelloWorld-Dm/Android.bp b/test/674-HelloWorld-Dm/Android.bp index bc75399d63..2ff2a0be0a 100644 --- a/test/674-HelloWorld-Dm/Android.bp +++ b/test/674-HelloWorld-Dm/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-674-HelloWorld-Dm", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-674-HelloWorld-Dm-expected"], } diff --git a/test/674-hotness-compiled/Android.bp b/test/674-hotness-compiled/Android.bp index 08776e527e..ca4f37220d 100644 --- a/test/674-hotness-compiled/Android.bp +++ b/test/674-hotness-compiled/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-674-hotness-compiled", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-674-hotness-compiled-expected"], } diff --git a/test/676-proxy-jit-at-first-use/Android.bp b/test/676-proxy-jit-at-first-use/Android.bp index e29f56bc6d..7ecdd2a1fd 100644 --- a/test/676-proxy-jit-at-first-use/Android.bp +++ b/test/676-proxy-jit-at-first-use/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-676-proxy-jit-at-first-use", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-676-proxy-jit-at-first-use-expected"], } diff --git a/test/677-fsi2/Android.bp b/test/677-fsi2/Android.bp index 1bf2ea6835..59c899aac2 100644 --- a/test/677-fsi2/Android.bp +++ b/test/677-fsi2/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-677-fsi2", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-677-fsi2-expected"], } diff --git a/test/679-locks/Android.bp b/test/679-locks/Android.bp index 3cbcd6068c..73d7b8e80a 100644 --- a/test/679-locks/Android.bp +++ b/test/679-locks/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-679-locks", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-679-locks-expected"], } diff --git a/test/680-checker-deopt-dex-pc-0/Android.bp b/test/680-checker-deopt-dex-pc-0/Android.bp index 1f0557de16..28c7a980bb 100644 --- a/test/680-checker-deopt-dex-pc-0/Android.bp +++ b/test/680-checker-deopt-dex-pc-0/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-680-checker-deopt-dex-pc-0", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-680-checker-deopt-dex-pc-0-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/680-sink-regression/Android.bp b/test/680-sink-regression/Android.bp index af68e7c186..0b2634d188 100644 --- a/test/680-sink-regression/Android.bp +++ b/test/680-sink-regression/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-680-sink-regression", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-680-sink-regression-expected"], } diff --git a/test/684-checker-simd-dotprod/Android.bp b/test/684-checker-simd-dotprod/Android.bp index 72c4f4fa7d..886c08c11e 100644 --- a/test/684-checker-simd-dotprod/Android.bp +++ b/test/684-checker-simd-dotprod/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-684-checker-simd-dotprod-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/684-select-condition/Android.bp b/test/684-select-condition/Android.bp index eaa3e3f940..bb0e490355 100644 --- a/test/684-select-condition/Android.bp +++ b/test/684-select-condition/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-684-select-condition", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-684-select-condition-expected"], } diff --git a/test/685-deoptimizeable/Android.bp b/test/685-deoptimizeable/Android.bp index 6926261eb8..04a8305efe 100644 --- a/test/685-deoptimizeable/Android.bp +++ b/test/685-deoptimizeable/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-685-deoptimizeable", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-685-deoptimizeable-expected"], } diff --git a/test/687-deopt/Android.bp b/test/687-deopt/Android.bp index 9545e65625..e75c905db1 100644 --- a/test/687-deopt/Android.bp +++ b/test/687-deopt/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-687-deopt", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-687-deopt-expected"], } diff --git a/test/689-multi-catch/Android.bp b/test/689-multi-catch/Android.bp index 58440b04a6..c383b95623 100644 --- a/test/689-multi-catch/Android.bp +++ b/test/689-multi-catch/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-689-multi-catch", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-689-multi-catch-expected"], } diff --git a/test/689-zygote-jit-deopt/Android.bp b/test/689-zygote-jit-deopt/Android.bp index ec817c1253..f76621eb1e 100644 --- a/test/689-zygote-jit-deopt/Android.bp +++ b/test/689-zygote-jit-deopt/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-689-zygote-jit-deopt", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-689-zygote-jit-deopt-expected"], } diff --git a/test/693-vdex-inmem-loader-evict/Android.bp b/test/693-vdex-inmem-loader-evict/Android.bp index ff3070cf79..97d8776af4 100644 --- a/test/693-vdex-inmem-loader-evict/Android.bp +++ b/test/693-vdex-inmem-loader-evict/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-693-vdex-inmem-loader-evict", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-693-vdex-inmem-loader-evict-expected"], } diff --git a/test/694-clinit-jit/Android.bp b/test/694-clinit-jit/Android.bp index e0172eba54..d118ffe89d 100644 --- a/test/694-clinit-jit/Android.bp +++ b/test/694-clinit-jit/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-694-clinit-jit", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-694-clinit-jit-expected"], } diff --git a/test/695-simplify-throws/Android.bp b/test/695-simplify-throws/Android.bp index 64431ebc20..c97bbc2063 100644 --- a/test/695-simplify-throws/Android.bp +++ b/test/695-simplify-throws/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-695-simplify-throws", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-695-simplify-throws-expected"], } diff --git a/test/696-loop/Android.bp b/test/696-loop/Android.bp index 3b90426028..cdaa17b509 100644 --- a/test/696-loop/Android.bp +++ b/test/696-loop/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-696-loop", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-696-loop-expected"], } diff --git a/test/697-checker-string-append/Android.bp b/test/697-checker-string-append/Android.bp index 9f79a49ad0..78210fd619 100644 --- a/test/697-checker-string-append/Android.bp +++ b/test/697-checker-string-append/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-697-checker-string-append-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/698-selects/Android.bp b/test/698-selects/Android.bp index a42a66cb84..f9b839c429 100644 --- a/test/698-selects/Android.bp +++ b/test/698-selects/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-698-selects", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-698-selects-expected"], } diff --git a/test/700-LoadArgRegs/Android.bp b/test/700-LoadArgRegs/Android.bp index 2037814d52..5b16670e9f 100644 --- a/test/700-LoadArgRegs/Android.bp +++ b/test/700-LoadArgRegs/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-700-LoadArgRegs", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-700-LoadArgRegs-expected"], } diff --git a/test/703-floating-point-div/Android.bp b/test/703-floating-point-div/Android.bp index 3ecaa16e38..c78061cc42 100644 --- a/test/703-floating-point-div/Android.bp +++ b/test/703-floating-point-div/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-703-floating-point-div", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-703-floating-point-div-expected"], } diff --git a/test/704-multiply-accumulate/Android.bp b/test/704-multiply-accumulate/Android.bp index e028a82bac..1906635db5 100644 --- a/test/704-multiply-accumulate/Android.bp +++ b/test/704-multiply-accumulate/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-704-multiply-accumulate", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-704-multiply-accumulate-expected"], } diff --git a/test/705-register-conflict/Android.bp b/test/705-register-conflict/Android.bp index 0ac442ba7e..e4a770db66 100644 --- a/test/705-register-conflict/Android.bp +++ b/test/705-register-conflict/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-705-register-conflict", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-705-register-conflict-expected"], } diff --git a/test/707-checker-invalid-profile/Android.bp b/test/707-checker-invalid-profile/Android.bp index a8cdbb3010..a7cac49e5d 100644 --- a/test/707-checker-invalid-profile/Android.bp +++ b/test/707-checker-invalid-profile/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-707-checker-invalid-profile", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-707-checker-invalid-profile-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/708-jit-cache-churn/Android.bp b/test/708-jit-cache-churn/Android.bp index c77919e676..23b37f60ef 100644 --- a/test/708-jit-cache-churn/Android.bp +++ b/test/708-jit-cache-churn/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-708-jit-cache-churn", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-708-jit-cache-churn-expected"], } diff --git a/test/711-checker-type-conversion/Android.bp b/test/711-checker-type-conversion/Android.bp index d9dac91d9c..67a03e87b6 100644 --- a/test/711-checker-type-conversion/Android.bp +++ b/test/711-checker-type-conversion/Android.bp @@ -6,6 +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", srcs: ["src/**/*.java"], data: [":art-run-test-711-checker-type-conversion-expected"], // Include the Java source files in the test's artifacts, to make Checker assertions diff --git a/test/717-integer-value-of/Android.bp b/test/717-integer-value-of/Android.bp index af86d08f60..655ede4360 100644 --- a/test/717-integer-value-of/Android.bp +++ b/test/717-integer-value-of/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-717-integer-value-of", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-717-integer-value-of-expected"], } diff --git a/test/718-zipfile-finalizer/Android.bp b/test/718-zipfile-finalizer/Android.bp index 2ffdcb7eae..64c7d36838 100644 --- a/test/718-zipfile-finalizer/Android.bp +++ b/test/718-zipfile-finalizer/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-718-zipfile-finalizer", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-718-zipfile-finalizer-expected"], } diff --git a/test/720-thread-priority/Android.bp b/test/720-thread-priority/Android.bp index ff2551e5e2..bfd1ae45a5 100644 --- a/test/720-thread-priority/Android.bp +++ b/test/720-thread-priority/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-720-thread-priority", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-720-thread-priority-expected"], } diff --git a/test/721-osr/Android.bp b/test/721-osr/Android.bp index 3a3f862dd0..0b2519dad0 100644 --- a/test/721-osr/Android.bp +++ b/test/721-osr/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-721-osr", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-721-osr-expected"], } diff --git a/test/726-array-store/Android.bp b/test/726-array-store/Android.bp index 135d2893f3..5ffe504390 100644 --- a/test/726-array-store/Android.bp +++ b/test/726-array-store/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-726-array-store", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-726-array-store-expected"], } diff --git a/test/805-TooDeepClassInstanceOf/Android.bp b/test/805-TooDeepClassInstanceOf/Android.bp index e33f7750fa..883248f73d 100644 --- a/test/805-TooDeepClassInstanceOf/Android.bp +++ b/test/805-TooDeepClassInstanceOf/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-805-TooDeepClassInstanceOf", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-805-TooDeepClassInstanceOf-expected"], } diff --git a/test/806-TooWideClassInstanceOf/Android.bp b/test/806-TooWideClassInstanceOf/Android.bp index a540a89c08..358eeb5b9f 100644 --- a/test/806-TooWideClassInstanceOf/Android.bp +++ b/test/806-TooWideClassInstanceOf/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-806-TooWideClassInstanceOf", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-806-TooWideClassInstanceOf-expected"], } diff --git a/test/812-recursive-default/Android.bp b/test/812-recursive-default/Android.bp new file mode 100644 index 0000000000..7deeecf2fc --- /dev/null +++ b/test/812-recursive-default/Android.bp @@ -0,0 +1,20 @@ +// Generated by `regen-test-files`. Do not edit manually. + +// Build rules for ART run-test `812-recursive-default`. + +// Test's Dex code. +java_test { + name: "art-run-test-812-recursive-default", + defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", + srcs: ["src/**/*.java"], + data: [":art-run-test-812-recursive-default-expected"], +} + +// Test's expected output. +genrule { + name: "art-run-test-812-recursive-default-expected", + out: ["art-run-test-812-recursive-default-expected.txt"], + srcs: ["expected.txt"], + cmd: "cp -f $(in) $(out)", +} diff --git a/test/900-hello-plugin/Android.bp b/test/900-hello-plugin/Android.bp index 76c3f2c487..4f8bbf46d0 100644 --- a/test/900-hello-plugin/Android.bp +++ b/test/900-hello-plugin/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-900-hello-plugin", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-900-hello-plugin-expected"], } diff --git a/test/901-hello-ti-agent/Android.bp b/test/901-hello-ti-agent/Android.bp index d57b90589b..25366fc3e8 100644 --- a/test/901-hello-ti-agent/Android.bp +++ b/test/901-hello-ti-agent/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-901-hello-ti-agent", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-901-hello-ti-agent-expected"], } diff --git a/test/902-hello-transformation/Android.bp b/test/902-hello-transformation/Android.bp index 11ec28ee77..8786f8af7e 100644 --- a/test/902-hello-transformation/Android.bp +++ b/test/902-hello-transformation/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-902-hello-transformation", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-902-hello-transformation-expected"], } diff --git a/test/903-hello-tagging/Android.bp b/test/903-hello-tagging/Android.bp index a57af07ea7..ccbe23b152 100644 --- a/test/903-hello-tagging/Android.bp +++ b/test/903-hello-tagging/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-903-hello-tagging", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-903-hello-tagging-expected"], } diff --git a/test/904-object-allocation/Android.bp b/test/904-object-allocation/Android.bp index 82df2e6160..32f12dcad2 100644 --- a/test/904-object-allocation/Android.bp +++ b/test/904-object-allocation/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-904-object-allocation", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-904-object-allocation-expected"], } diff --git a/test/905-object-free/Android.bp b/test/905-object-free/Android.bp index 08a56a4d5f..1914fc918e 100644 --- a/test/905-object-free/Android.bp +++ b/test/905-object-free/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-905-object-free", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-905-object-free-expected"], } diff --git a/test/906-iterate-heap/Android.bp b/test/906-iterate-heap/Android.bp index fbb0344433..7bfc927bf7 100644 --- a/test/906-iterate-heap/Android.bp +++ b/test/906-iterate-heap/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-906-iterate-heap", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-906-iterate-heap-expected"], } diff --git a/test/907-get-loaded-classes/Android.bp b/test/907-get-loaded-classes/Android.bp index 24af679d26..1161fec788 100644 --- a/test/907-get-loaded-classes/Android.bp +++ b/test/907-get-loaded-classes/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-907-get-loaded-classes", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-907-get-loaded-classes-expected"], } diff --git a/test/908-gc-start-finish/Android.bp b/test/908-gc-start-finish/Android.bp index 17833f8da2..5a2fb4b509 100644 --- a/test/908-gc-start-finish/Android.bp +++ b/test/908-gc-start-finish/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-908-gc-start-finish", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-908-gc-start-finish-expected"], } diff --git a/test/910-methods/Android.bp b/test/910-methods/Android.bp index f1782e1273..a469a911e9 100644 --- a/test/910-methods/Android.bp +++ b/test/910-methods/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-910-methods", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-910-methods-expected"], } diff --git a/test/911-get-stack-trace/Android.bp b/test/911-get-stack-trace/Android.bp index 83432104c7..753e9cb957 100644 --- a/test/911-get-stack-trace/Android.bp +++ b/test/911-get-stack-trace/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-911-get-stack-trace", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-911-get-stack-trace-expected"], } diff --git a/test/913-heaps/Android.bp b/test/913-heaps/Android.bp index c946ca8d09..8b1a4f1c05 100644 --- a/test/913-heaps/Android.bp +++ b/test/913-heaps/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-913-heaps", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-913-heaps-expected"], } diff --git a/test/914-hello-obsolescence/Android.bp b/test/914-hello-obsolescence/Android.bp index 8ff2dd84f6..c13ce40a18 100644 --- a/test/914-hello-obsolescence/Android.bp +++ b/test/914-hello-obsolescence/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-914-hello-obsolescence", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-914-hello-obsolescence-expected"], } diff --git a/test/915-obsolete-2/Android.bp b/test/915-obsolete-2/Android.bp index 278f39e770..6acd1cb4ad 100644 --- a/test/915-obsolete-2/Android.bp +++ b/test/915-obsolete-2/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-915-obsolete-2", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-915-obsolete-2-expected"], } diff --git a/test/916-obsolete-jit/Android.bp b/test/916-obsolete-jit/Android.bp index a4e7e7c8c4..0bba027cac 100644 --- a/test/916-obsolete-jit/Android.bp +++ b/test/916-obsolete-jit/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-916-obsolete-jit", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-916-obsolete-jit-expected"], } diff --git a/test/917-fields-transformation/Android.bp b/test/917-fields-transformation/Android.bp index b3cb21ba44..0661468600 100644 --- a/test/917-fields-transformation/Android.bp +++ b/test/917-fields-transformation/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-917-fields-transformation", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-917-fields-transformation-expected"], } diff --git a/test/918-fields/Android.bp b/test/918-fields/Android.bp index 549ba1a57d..bf8dc9bff1 100644 --- a/test/918-fields/Android.bp +++ b/test/918-fields/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-918-fields", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-918-fields-expected"], } diff --git a/test/919-obsolete-fields/Android.bp b/test/919-obsolete-fields/Android.bp index 0b6b816267..03b7fd2028 100644 --- a/test/919-obsolete-fields/Android.bp +++ b/test/919-obsolete-fields/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-919-obsolete-fields", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-919-obsolete-fields-expected"], } diff --git a/test/920-objects/Android.bp b/test/920-objects/Android.bp index 65ee0227eb..ea73bba8ee 100644 --- a/test/920-objects/Android.bp +++ b/test/920-objects/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-920-objects", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-920-objects-expected"], } diff --git a/test/921-hello-failure/Android.bp b/test/921-hello-failure/Android.bp index 609704bb2d..6a2c34d47a 100644 --- a/test/921-hello-failure/Android.bp +++ b/test/921-hello-failure/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-921-hello-failure", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-921-hello-failure-expected"], } diff --git a/test/922-properties/Android.bp b/test/922-properties/Android.bp index 6eec884835..fb4cc99ada 100644 --- a/test/922-properties/Android.bp +++ b/test/922-properties/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-922-properties", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-922-properties-expected"], } diff --git a/test/923-monitors/Android.bp b/test/923-monitors/Android.bp index 945f50ea71..75b5464591 100644 --- a/test/923-monitors/Android.bp +++ b/test/923-monitors/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-923-monitors", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-923-monitors-expected"], } diff --git a/test/924-threads/Android.bp b/test/924-threads/Android.bp index d66cdadf9f..40427cdc9d 100644 --- a/test/924-threads/Android.bp +++ b/test/924-threads/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-924-threads", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-924-threads-expected"], } diff --git a/test/925-threadgroups/Android.bp b/test/925-threadgroups/Android.bp index 4aac0ab69f..410468e144 100644 --- a/test/925-threadgroups/Android.bp +++ b/test/925-threadgroups/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-925-threadgroups", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-925-threadgroups-expected"], } diff --git a/test/926-multi-obsolescence/Android.bp b/test/926-multi-obsolescence/Android.bp index 0ede109a99..81c3d32712 100644 --- a/test/926-multi-obsolescence/Android.bp +++ b/test/926-multi-obsolescence/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-926-multi-obsolescence", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-926-multi-obsolescence-expected"], } diff --git a/test/927-timers/Android.bp b/test/927-timers/Android.bp index 084f62f50f..194da57190 100644 --- a/test/927-timers/Android.bp +++ b/test/927-timers/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-927-timers", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-927-timers-expected"], } diff --git a/test/928-jni-table/Android.bp b/test/928-jni-table/Android.bp index a23441113e..331509c920 100644 --- a/test/928-jni-table/Android.bp +++ b/test/928-jni-table/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-928-jni-table", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-928-jni-table-expected"], } diff --git a/test/930-hello-retransform/Android.bp b/test/930-hello-retransform/Android.bp index 8a31e475ce..3bea01343d 100644 --- a/test/930-hello-retransform/Android.bp +++ b/test/930-hello-retransform/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-930-hello-retransform", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-930-hello-retransform-expected"], } diff --git a/test/931-agent-thread/Android.bp b/test/931-agent-thread/Android.bp index c8a0dae61c..6d594c043f 100644 --- a/test/931-agent-thread/Android.bp +++ b/test/931-agent-thread/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-931-agent-thread", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-931-agent-thread-expected"], } diff --git a/test/932-transform-saves/Android.bp b/test/932-transform-saves/Android.bp index 365d63589e..a86603b289 100644 --- a/test/932-transform-saves/Android.bp +++ b/test/932-transform-saves/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-932-transform-saves", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-932-transform-saves-expected"], } diff --git a/test/933-misc-events/Android.bp b/test/933-misc-events/Android.bp index 902c7c7000..d943ebc5b5 100644 --- a/test/933-misc-events/Android.bp +++ b/test/933-misc-events/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-933-misc-events", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-933-misc-events-expected"], } diff --git a/test/937-hello-retransform-package/Android.bp b/test/937-hello-retransform-package/Android.bp index 909675debe..b2ee4b9f16 100644 --- a/test/937-hello-retransform-package/Android.bp +++ b/test/937-hello-retransform-package/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-937-hello-retransform-package", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-937-hello-retransform-package-expected"], } diff --git a/test/939-hello-transformation-bcp/Android.bp b/test/939-hello-transformation-bcp/Android.bp index eb4f0078d7..adb1b9112b 100644 --- a/test/939-hello-transformation-bcp/Android.bp +++ b/test/939-hello-transformation-bcp/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-939-hello-transformation-bcp", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-939-hello-transformation-bcp-expected"], } diff --git a/test/940-recursive-obsolete/Android.bp b/test/940-recursive-obsolete/Android.bp index 40bd26fc4b..eab82640a7 100644 --- a/test/940-recursive-obsolete/Android.bp +++ b/test/940-recursive-obsolete/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-940-recursive-obsolete", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-940-recursive-obsolete-expected"], } diff --git a/test/941-recursive-obsolete-jit/Android.bp b/test/941-recursive-obsolete-jit/Android.bp index e02d430075..2d11b989ed 100644 --- a/test/941-recursive-obsolete-jit/Android.bp +++ b/test/941-recursive-obsolete-jit/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-941-recursive-obsolete-jit", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-941-recursive-obsolete-jit-expected"], } diff --git a/test/942-private-recursive/Android.bp b/test/942-private-recursive/Android.bp index f2705ba0ad..beb8d15179 100644 --- a/test/942-private-recursive/Android.bp +++ b/test/942-private-recursive/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-942-private-recursive", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-942-private-recursive-expected"], } diff --git a/test/943-private-recursive-jit/Android.bp b/test/943-private-recursive-jit/Android.bp index 38a78cfc0f..0814b97dee 100644 --- a/test/943-private-recursive-jit/Android.bp +++ b/test/943-private-recursive-jit/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-943-private-recursive-jit", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-943-private-recursive-jit-expected"], } diff --git a/test/944-transform-classloaders/Android.bp b/test/944-transform-classloaders/Android.bp index 24e184e326..8b9eca1a60 100644 --- a/test/944-transform-classloaders/Android.bp +++ b/test/944-transform-classloaders/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-944-transform-classloaders", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-944-transform-classloaders-expected"], } diff --git a/test/945-obsolete-native/Android.bp b/test/945-obsolete-native/Android.bp index b98fabb0f1..97f927509e 100644 --- a/test/945-obsolete-native/Android.bp +++ b/test/945-obsolete-native/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-945-obsolete-native", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-945-obsolete-native-expected"], } diff --git a/test/946-obsolete-throw/Android.bp b/test/946-obsolete-throw/Android.bp index 865d11c135..2462bcfca2 100644 --- a/test/946-obsolete-throw/Android.bp +++ b/test/946-obsolete-throw/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-946-obsolete-throw", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-946-obsolete-throw-expected"], } diff --git a/test/947-reflect-method/Android.bp b/test/947-reflect-method/Android.bp index 44bf5aefd4..9fa7a56ed6 100644 --- a/test/947-reflect-method/Android.bp +++ b/test/947-reflect-method/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-947-reflect-method", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-947-reflect-method-expected"], } diff --git a/test/949-in-memory-transform/Android.bp b/test/949-in-memory-transform/Android.bp index 0c702dc684..257285cf93 100644 --- a/test/949-in-memory-transform/Android.bp +++ b/test/949-in-memory-transform/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-949-in-memory-transform", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-949-in-memory-transform-expected"], } diff --git a/test/950-redefine-intrinsic/Android.bp b/test/950-redefine-intrinsic/Android.bp index 4d4795d84b..858c6ccd17 100644 --- a/test/950-redefine-intrinsic/Android.bp +++ b/test/950-redefine-intrinsic/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-950-redefine-intrinsic", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-950-redefine-intrinsic-expected"], } diff --git a/test/951-threaded-obsolete/Android.bp b/test/951-threaded-obsolete/Android.bp index 0e865603cf..0adfe984c9 100644 --- a/test/951-threaded-obsolete/Android.bp +++ b/test/951-threaded-obsolete/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-951-threaded-obsolete", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-951-threaded-obsolete-expected"], } diff --git a/test/963-default-range-smali/Android.bp b/test/963-default-range-smali/Android.bp index 73eb0fd416..71d0242286 100644 --- a/test/963-default-range-smali/Android.bp +++ b/test/963-default-range-smali/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-963-default-range-smali", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], data: [":art-run-test-963-default-range-smali-expected"], } diff --git a/test/982-ok-no-retransform/Android.bp b/test/982-ok-no-retransform/Android.bp index ac3dfa554f..cb1ae9a2ab 100644 --- a/test/982-ok-no-retransform/Android.bp +++ b/test/982-ok-no-retransform/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-982-ok-no-retransform", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-982-ok-no-retransform-expected"], } diff --git a/test/983-source-transform-verify/Android.bp b/test/983-source-transform-verify/Android.bp index 22b74372ee..4572d67686 100644 --- a/test/983-source-transform-verify/Android.bp +++ b/test/983-source-transform-verify/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-983-source-transform-verify", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-983-source-transform-verify-expected"], } diff --git a/test/984-obsolete-invoke/Android.bp b/test/984-obsolete-invoke/Android.bp index 2f9ef10468..25d8f76b0c 100644 --- a/test/984-obsolete-invoke/Android.bp +++ b/test/984-obsolete-invoke/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-984-obsolete-invoke", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-984-obsolete-invoke-expected"], } diff --git a/test/985-re-obsolete/Android.bp b/test/985-re-obsolete/Android.bp index 9c5380c98a..c8f73ffb47 100644 --- a/test/985-re-obsolete/Android.bp +++ b/test/985-re-obsolete/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-985-re-obsolete", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-985-re-obsolete-expected"], } diff --git a/test/986-native-method-bind/Android.bp b/test/986-native-method-bind/Android.bp index 1779dd11e4..b5ce5444f3 100644 --- a/test/986-native-method-bind/Android.bp +++ b/test/986-native-method-bind/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-986-native-method-bind", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-986-native-method-bind-expected"], } diff --git a/test/987-agent-bind/Android.bp b/test/987-agent-bind/Android.bp index 59ce39cdd2..44888478bb 100644 --- a/test/987-agent-bind/Android.bp +++ b/test/987-agent-bind/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-987-agent-bind", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-987-agent-bind-expected"], } diff --git a/test/988-method-trace/Android.bp b/test/988-method-trace/Android.bp index e7368f9e38..bec9837b94 100644 --- a/test/988-method-trace/Android.bp +++ b/test/988-method-trace/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-988-method-trace", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-988-method-trace-expected"], } diff --git a/test/989-method-trace-throw/Android.bp b/test/989-method-trace-throw/Android.bp index 78ee8d29d9..3cf8e354bb 100644 --- a/test/989-method-trace-throw/Android.bp +++ b/test/989-method-trace-throw/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-989-method-trace-throw", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-989-method-trace-throw-expected"], } diff --git a/test/990-field-trace/Android.bp b/test/990-field-trace/Android.bp index ac1d9a104b..929f43d030 100644 --- a/test/990-field-trace/Android.bp +++ b/test/990-field-trace/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-990-field-trace", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-990-field-trace-expected"], } diff --git a/test/991-field-trace-2/Android.bp b/test/991-field-trace-2/Android.bp index 80c8440ccd..00216f3384 100644 --- a/test/991-field-trace-2/Android.bp +++ b/test/991-field-trace-2/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-991-field-trace-2", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-991-field-trace-2-expected"], } diff --git a/test/992-source-data/Android.bp b/test/992-source-data/Android.bp index 2eca4969ee..8b27e34566 100644 --- a/test/992-source-data/Android.bp +++ b/test/992-source-data/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-992-source-data", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-992-source-data-expected"], } diff --git a/test/993-breakpoints/Android.bp b/test/993-breakpoints/Android.bp index 067c39b662..e65f96047c 100644 --- a/test/993-breakpoints/Android.bp +++ b/test/993-breakpoints/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-993-breakpoints", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-993-breakpoints-expected"], } diff --git a/test/994-breakpoint-line/Android.bp b/test/994-breakpoint-line/Android.bp index 2accb709cd..c1dc98db14 100644 --- a/test/994-breakpoint-line/Android.bp +++ b/test/994-breakpoint-line/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-994-breakpoint-line", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-994-breakpoint-line-expected"], } diff --git a/test/995-breakpoints-throw/Android.bp b/test/995-breakpoints-throw/Android.bp index 5c710c2e2c..001847c477 100644 --- a/test/995-breakpoints-throw/Android.bp +++ b/test/995-breakpoints-throw/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-995-breakpoints-throw", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-995-breakpoints-throw-expected"], } diff --git a/test/996-breakpoint-obsolete/Android.bp b/test/996-breakpoint-obsolete/Android.bp index cba293aef1..da4ae0f7bd 100644 --- a/test/996-breakpoint-obsolete/Android.bp +++ b/test/996-breakpoint-obsolete/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-996-breakpoint-obsolete", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-996-breakpoint-obsolete-expected"], } diff --git a/test/997-single-step/Android.bp b/test/997-single-step/Android.bp index c4e3a429ec..7eef9b9e07 100644 --- a/test/997-single-step/Android.bp +++ b/test/997-single-step/Android.bp @@ -6,6 +6,7 @@ java_test { name: "art-run-test-997-single-step", defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [":art-run-test-997-single-step-expected"], } diff --git a/test/Android.bp b/test/Android.bp index 514b54ddb0..152a79f969 100644 --- a/test/Android.bp +++ b/test/Android.bp @@ -186,10 +186,25 @@ art_cc_library { // ART run-tests. +// Test configuration template for ART run-tests on target expected to run +// successfully, and as such tagged as part of TradeFed's `art-target-run-test` +// test suite via the `test-suite-tag`. filegroup { - name: "art-run-test-template", + name: "art-run-test-target-template", srcs: [ - "AndroidTestTemplate.xml", + "art-run-test-target-template.xml", + ], +} + +// Test configuration template for ART run-tests on target expected to run +// successfully, and as such *not* tagged as part of TradeFed's +// `art-target-run-test` test suite via the `test-suite-tag`. This is as +// temporary measure, while we add proper support for all ART (target) run-tests +// to TradeFed (b/147818031). +filegroup { + name: "art-run-test-target-no-test-suite-tag-template", + srcs: [ + "art-run-test-target-no-test-suite-tag-template.xml", ], } @@ -212,7 +227,6 @@ java_defaults { javacflags: ["-XepDisableAllChecks"], }, - test_config_template: ":art-run-test-template", test_suites: [ "general-tests", "mts", diff --git a/test/art-run-test-target-no-test-suite-tag-template.xml b/test/art-run-test-target-no-test-suite-tag-template.xml new file mode 100644 index 0000000000..cad7aceae4 --- /dev/null +++ b/test/art-run-test-target-no-test-suite-tag-template.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2020 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<!-- Note: This test config for {MODULE} is generated from a template. --> +<configuration description="Test module config for {MODULE}"> + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> + <option name="cleanup" value="true" /> + <!-- TODO: Use option `push-file` instead of deprecated option + `push`. --> + <option name="push" value="{MODULE}.jar->/data/local/tmp/{MODULE}/{MODULE}.jar" /> + </target_preparer> + <test class="com.android.tradefed.testtype.ArtRunTest"> + <option name="run-test-name" value="{MODULE}" /> + <option name="classpath" value="/data/local/tmp/{MODULE}/{MODULE}.jar" /> + </test> +</configuration> diff --git a/test/AndroidTestTemplate.xml b/test/art-run-test-target-template.xml index 320afa9f7f..320afa9f7f 100644 --- a/test/AndroidTestTemplate.xml +++ b/test/art-run-test-target-template.xml diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files index b47aa4e914..d1924a59e4 100755 --- a/test/utils/regen-test-files +++ b/test/utils/regen-test-files @@ -28,6 +28,18 @@ fi me=$(basename "$0") +# array_contains ELEMENT ARRAY +# ---------------------------- +# Test whether ARRAY contains (at least one instance of) ELEMENT; return 0 if +# true, and 1 otherwise. +array_contains () { + for e in "${@:2}" + do + [[ "$e" == "$1" ]] && return 0 + done + return 1 +} + # Known failing tests. # TODO(rpl): Investigate and address the causes of failures. known_failing_tests=( @@ -156,6 +168,7 @@ known_failing_tests=( art-run-test-2031-zygote-compiled-frame-deopt art-run-test-2033-shutdown-mechanics art-run-test-2036-jni-filechannel + art-run-test-2037-thread-name-inherit art-run-test-305-other-fault-handler art-run-test-449-checker-bce art-run-test-454-get-vreg @@ -277,6 +290,12 @@ num_tests=0 # List of tests for which a Blueprint file is generated. declare -a handled_tests +# Test expected to succeed (complement of `known_failing_tests` in +# `handled_tests`), and thus added to ART's `TEST_MAPPING` file, and also tagged +# as part of TradeFed's `art-target-run-test` test suite via the +# `test-suite-tag` option in their configuration file. +declare -a expected_succeeding_tests + # Regenerate Blueprint files. # --------------------------- @@ -312,6 +331,28 @@ while read run_test; do run_test_name="art-run-test-$run_test" + # Record test name in `handled_tests`. + handled_tests+=("$run_test_name") + + # Check whether the test is expected to fail and: + # 1. select the test configuration template (tagging the test as part of the + # `art-target-run-test` test suite or not) based on its expected outcome; + # 2. if the test is not expected to fail, add it to + # `expected_succeeding_tests`, so that it is included in ART's + # `TEST_MAPPING` file (see below). + # + # 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. + if array_contains "$run_test_name" "${known_failing_tests[@]}" \ + || [[ "$run_test_name" =~ ^art-run-test-[0-9]+-checker- ]]; then + test_config_template="art-run-test-target-no-test-suite-tag-template" + else + test_config_template="art-run-test-target-template" + expected_succeeding_tests+=("$run_test_name") + fi + if [[ "$run_test" =~ ^[0-9]+-checker- ]]; then include_src=" // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. @@ -330,6 +371,7 @@ while read run_test; do java_test { name: "$run_test_name", defaults: ["art-run-test-defaults"], + test_config_template: ":$test_config_template", srcs: ["src/**/*.java"], data: [":$run_test_name-expected"], $include_src} @@ -342,9 +384,6 @@ genrule { cmd: "cp -f \$(in) \$(out)", } EOF - - # Record test name. - handled_tests+=("$run_test_name") done <<< $(ls -1 $tests_dir | grep -E '^[0-9]{3,}-') handled_tests_percentage=$((${#handled_tests[@]} * 100 / num_tests)) @@ -357,20 +396,6 @@ echo "Generated Blueprint files for ${#handled_tests[@]} ART run-tests ouf of $n # Note: We only include ART run-tests expected to succeed for now. -# Complement of `known_failing_tests` in `handled_tests`. -declare -a expected_succeeding_tests -for run_test in "${handled_tests[@]}"; do - for fail in "${known_failing_tests[@]}"; do - [[ "$run_test" == "$fail" ]] && continue 2 - # Also temporarily exclude Checker tests from test mapping, as they - # currently break some test runs (see b/169852871). - # TODO(b/162408889): Complete Checker integration and re-include Checker - # tests in test mapping. - [[ "$run_test" =~ ^art-run-test-[0-9]+-checker- ]] && continue 2 - done - expected_succeeding_tests+=("$run_test") -done - # Prologue. cat >TEST_MAPPING <<EOF // Generated by \`$me\`. Do not edit manually. |