diff options
467 files changed, 1395 insertions, 1 deletions
diff --git a/test/001-HelloWorld/Android.bp b/test/001-HelloWorld/Android.bp index 15f4f58ed7..2afb6a6c44 100644 --- a/test/001-HelloWorld/Android.bp +++ b/test/001-HelloWorld/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-001-HelloWorld-expected-stdout", ":art-run-test-001-HelloWorld-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/001-Main/Android.bp b/test/001-Main/Android.bp index 450e4af421..89f263f0f0 100644 --- a/test/001-Main/Android.bp +++ b/test/001-Main/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-001-Main-expected-stdout", ":art-run-test-001-Main-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/002-sleep/Android.bp b/test/002-sleep/Android.bp index ce16240ff5..7a0586087e 100644 --- a/test/002-sleep/Android.bp +++ b/test/002-sleep/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-002-sleep-expected-stdout", ":art-run-test-002-sleep-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/004-InterfaceTest/Android.bp b/test/004-InterfaceTest/Android.bp index 4ba1240517..5060dae4a5 100644 --- a/test/004-InterfaceTest/Android.bp +++ b/test/004-InterfaceTest/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-004-InterfaceTest-expected-stdout", ":art-run-test-004-InterfaceTest-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/004-checker-UnsafeTest18/Android.bp b/test/004-checker-UnsafeTest18/Android.bp index 627084000e..b392bbefac 100644 --- a/test/004-checker-UnsafeTest18/Android.bp +++ b/test/004-checker-UnsafeTest18/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-004-checker-UnsafeTest18-expected-stdout", ":art-run-test-004-checker-UnsafeTest18-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/006-args/Android.bp b/test/006-args/Android.bp index dc56f814c5..2a369cb9cf 100644 --- a/test/006-args/Android.bp +++ b/test/006-args/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-006-args-expected-stdout", ":art-run-test-006-args-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/007-count10/Android.bp b/test/007-count10/Android.bp index 36e15df701..7bb855ecc6 100644 --- a/test/007-count10/Android.bp +++ b/test/007-count10/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-007-count10-expected-stdout", ":art-run-test-007-count10-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/009-instanceof/Android.bp b/test/009-instanceof/Android.bp index 5dcfc446ef..ab2799f731 100644 --- a/test/009-instanceof/Android.bp +++ b/test/009-instanceof/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-009-instanceof-expected-stdout", ":art-run-test-009-instanceof-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/010-instance/Android.bp b/test/010-instance/Android.bp index f7515f8b1a..a5cf1eb36d 100644 --- a/test/010-instance/Android.bp +++ b/test/010-instance/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-010-instance-expected-stdout", ":art-run-test-010-instance-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/011-array-copy/Android.bp b/test/011-array-copy/Android.bp index b0f0b904b9..6f19cb05e8 100644 --- a/test/011-array-copy/Android.bp +++ b/test/011-array-copy/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-011-array-copy-expected-stdout", ":art-run-test-011-array-copy-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/011-array-copy2/Android.bp b/test/011-array-copy2/Android.bp index d223d7ea61..e61bec8fb8 100644 --- a/test/011-array-copy2/Android.bp +++ b/test/011-array-copy2/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-011-array-copy2-expected-stdout", ":art-run-test-011-array-copy2-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/012-math/Android.bp b/test/012-math/Android.bp index 0e249b9584..235338f71e 100644 --- a/test/012-math/Android.bp +++ b/test/012-math/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-012-math-expected-stdout", ":art-run-test-012-math-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/013-math2/Android.bp b/test/013-math2/Android.bp index ea74045a7b..8a39ff0795 100644 --- a/test/013-math2/Android.bp +++ b/test/013-math2/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-013-math2-expected-stdout", ":art-run-test-013-math2-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/014-math3/Android.bp b/test/014-math3/Android.bp index 83624bd519..8a6f9a4db3 100644 --- a/test/014-math3/Android.bp +++ b/test/014-math3/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-014-math3-expected-stdout", ":art-run-test-014-math3-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/015-checker-switch/Android.bp b/test/015-checker-switch/Android.bp index 110dcac490..e498579008 100644 --- a/test/015-checker-switch/Android.bp +++ b/test/015-checker-switch/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-015-checker-switch-expected-stdout", ":art-run-test-015-checker-switch-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/016-intern/Android.bp b/test/016-intern/Android.bp index ca6e73f6b3..0a2ca6f146 100644 --- a/test/016-intern/Android.bp +++ b/test/016-intern/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-016-intern-expected-stdout", ":art-run-test-016-intern-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/017-float/Android.bp b/test/017-float/Android.bp index 87e4ba8e45..74f49ef961 100644 --- a/test/017-float/Android.bp +++ b/test/017-float/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-017-float-expected-stdout", ":art-run-test-017-float-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/018-stack-overflow/Android.bp b/test/018-stack-overflow/Android.bp index d5bb932c5d..b7b2445cc3 100644 --- a/test/018-stack-overflow/Android.bp +++ b/test/018-stack-overflow/Android.bp @@ -24,6 +24,7 @@ java_test { test_suites: [ "cts", "mcts-art", + "mts-art", ], sdk_version: "test_current", } diff --git a/test/019-wrong-array-type/Android.bp b/test/019-wrong-array-type/Android.bp index 51db2d3d34..f63ec22e34 100644 --- a/test/019-wrong-array-type/Android.bp +++ b/test/019-wrong-array-type/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-019-wrong-array-type-expected-stdout", ":art-run-test-019-wrong-array-type-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/020-string/Android.bp b/test/020-string/Android.bp index e588f2f694..5addf57a7c 100644 --- a/test/020-string/Android.bp +++ b/test/020-string/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-020-string-expected-stdout", ":art-run-test-020-string-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/021-string2/Android.bp b/test/021-string2/Android.bp index 7a6183c0a2..c89ba17d47 100644 --- a/test/021-string2/Android.bp +++ b/test/021-string2/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-021-string2-expected-stdout", ":art-run-test-021-string2-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/022-interface/Android.bp b/test/022-interface/Android.bp index 765527965c..6ab1577ac2 100644 --- a/test/022-interface/Android.bp +++ b/test/022-interface/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-022-interface-expected-stdout", ":art-run-test-022-interface-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/024-illegal-access/Android.bp b/test/024-illegal-access/Android.bp index 956f7992bf..d37b9ee25e 100644 --- a/test/024-illegal-access/Android.bp +++ b/test/024-illegal-access/Android.bp @@ -31,6 +31,9 @@ java_test { ":art-run-test-024-illegal-access-expected-stdout", ":art-run-test-024-illegal-access-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/025-access-controller/Android.bp b/test/025-access-controller/Android.bp index b02cf03567..5bb297ff5b 100644 --- a/test/025-access-controller/Android.bp +++ b/test/025-access-controller/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-025-access-controller-expected-stdout", ":art-run-test-025-access-controller-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/026-access/Android.bp b/test/026-access/Android.bp index 74153c47f8..7abae5fe45 100644 --- a/test/026-access/Android.bp +++ b/test/026-access/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-026-access-expected-stdout", ":art-run-test-026-access-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/027-arithmetic/Android.bp b/test/027-arithmetic/Android.bp index bd16e9d7e1..21a5ee5a38 100644 --- a/test/027-arithmetic/Android.bp +++ b/test/027-arithmetic/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-027-arithmetic-expected-stdout", ":art-run-test-027-arithmetic-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/028-array-write/Android.bp b/test/028-array-write/Android.bp index 1375c6e587..db03096aa3 100644 --- a/test/028-array-write/Android.bp +++ b/test/028-array-write/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-028-array-write-expected-stdout", ":art-run-test-028-array-write-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/029-assert/Android.bp b/test/029-assert/Android.bp index 466f134e1c..094c7dab95 100644 --- a/test/029-assert/Android.bp +++ b/test/029-assert/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-029-assert-expected-stdout", ":art-run-test-029-assert-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/032-concrete-sub/Android.bp b/test/032-concrete-sub/Android.bp index 236137efa6..7164328260 100644 --- a/test/032-concrete-sub/Android.bp +++ b/test/032-concrete-sub/Android.bp @@ -31,6 +31,9 @@ java_test { ":art-run-test-032-concrete-sub-expected-stdout", ":art-run-test-032-concrete-sub-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/033-class-init-deadlock/Android.bp b/test/033-class-init-deadlock/Android.bp index 5aae481ac7..1ac60db488 100644 --- a/test/033-class-init-deadlock/Android.bp +++ b/test/033-class-init-deadlock/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-033-class-init-deadlock-expected-stdout", ":art-run-test-033-class-init-deadlock-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/035-enum/Android.bp b/test/035-enum/Android.bp index 4041fea014..5d7ea94a56 100644 --- a/test/035-enum/Android.bp +++ b/test/035-enum/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-035-enum-expected-stdout", ":art-run-test-035-enum-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/036-finalizer/Android.bp b/test/036-finalizer/Android.bp index 6e2ca7a739..88bc0cf621 100644 --- a/test/036-finalizer/Android.bp +++ b/test/036-finalizer/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-036-finalizer-expected-stdout", ":art-run-test-036-finalizer-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/037-inherit/Android.bp b/test/037-inherit/Android.bp index fc11a8ebb1..c59bbb8308 100644 --- a/test/037-inherit/Android.bp +++ b/test/037-inherit/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-037-inherit-expected-stdout", ":art-run-test-037-inherit-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/039-join-main/Android.bp b/test/039-join-main/Android.bp index a6f9df4797..49a853956e 100644 --- a/test/039-join-main/Android.bp +++ b/test/039-join-main/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-039-join-main-expected-stdout", ":art-run-test-039-join-main-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/040-miranda/Android.bp b/test/040-miranda/Android.bp index ca965abc51..09be267b9f 100644 --- a/test/040-miranda/Android.bp +++ b/test/040-miranda/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-040-miranda-expected-stdout", ":art-run-test-040-miranda-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/041-narrowing/Android.bp b/test/041-narrowing/Android.bp index 4ad0b9c576..8df065bea7 100644 --- a/test/041-narrowing/Android.bp +++ b/test/041-narrowing/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-041-narrowing-expected-stdout", ":art-run-test-041-narrowing-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/042-new-instance/Android.bp b/test/042-new-instance/Android.bp index c2c40dd5c8..a345a8ef8c 100644 --- a/test/042-new-instance/Android.bp +++ b/test/042-new-instance/Android.bp @@ -31,6 +31,9 @@ java_test { ":art-run-test-042-new-instance-expected-stdout", ":art-run-test-042-new-instance-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/043-privates/Android.bp b/test/043-privates/Android.bp index dd5b476a0d..2764f5f61c 100644 --- a/test/043-privates/Android.bp +++ b/test/043-privates/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-043-privates-expected-stdout", ":art-run-test-043-privates-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/045-reflect-array/Android.bp b/test/045-reflect-array/Android.bp index c10758c3a8..5c1ce62007 100644 --- a/test/045-reflect-array/Android.bp +++ b/test/045-reflect-array/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-045-reflect-array-expected-stdout", ":art-run-test-045-reflect-array-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/046-reflect/Android.bp b/test/046-reflect/Android.bp index 4dcf475af8..907f4fbaa8 100644 --- a/test/046-reflect/Android.bp +++ b/test/046-reflect/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-046-reflect-expected-stdout", ":art-run-test-046-reflect-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/047-returns/Android.bp b/test/047-returns/Android.bp index f6a3312841..e6142e39a3 100644 --- a/test/047-returns/Android.bp +++ b/test/047-returns/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-047-returns-expected-stdout", ":art-run-test-047-returns-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/048-reflect-v8/Android.bp b/test/048-reflect-v8/Android.bp index 778e3d6deb..008e613155 100644 --- a/test/048-reflect-v8/Android.bp +++ b/test/048-reflect-v8/Android.bp @@ -24,6 +24,7 @@ java_test { test_suites: [ "cts", "mcts-art", + "mts-art", ], sdk_version: "test_current", } diff --git a/test/049-show-object/Android.bp b/test/049-show-object/Android.bp index 75bda84b2f..beeb29f67f 100644 --- a/test/049-show-object/Android.bp +++ b/test/049-show-object/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-049-show-object-expected-stdout", ":art-run-test-049-show-object-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/050-sync-test/Android.bp b/test/050-sync-test/Android.bp index 6959b05d76..c315837c74 100644 --- a/test/050-sync-test/Android.bp +++ b/test/050-sync-test/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-050-sync-test-expected-stdout", ":art-run-test-050-sync-test-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/052-verifier-fun/Android.bp b/test/052-verifier-fun/Android.bp index 8c3da44123..715fdf8e9a 100644 --- a/test/052-verifier-fun/Android.bp +++ b/test/052-verifier-fun/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-052-verifier-fun-expected-stdout", ":art-run-test-052-verifier-fun-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/053-wait-some/Android.bp b/test/053-wait-some/Android.bp index 210cecbf91..973b83e9c0 100644 --- a/test/053-wait-some/Android.bp +++ b/test/053-wait-some/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-053-wait-some-expected-stdout", ":art-run-test-053-wait-some-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/055-enum-performance/Android.bp b/test/055-enum-performance/Android.bp index 57f353429f..b56c8d7db7 100644 --- a/test/055-enum-performance/Android.bp +++ b/test/055-enum-performance/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-055-enum-performance-expected-stdout", ":art-run-test-055-enum-performance-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/057-math-intrinsics/Android.bp b/test/057-math-intrinsics/Android.bp index a48b868e95..77bbe2ee2c 100644 --- a/test/057-math-intrinsics/Android.bp +++ b/test/057-math-intrinsics/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-057-math-intrinsics-expected-stdout", ":art-run-test-057-math-intrinsics-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/058-enum-order/Android.bp b/test/058-enum-order/Android.bp index 7ee529e3b5..0392437e06 100644 --- a/test/058-enum-order/Android.bp +++ b/test/058-enum-order/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-058-enum-order-expected-stdout", ":art-run-test-058-enum-order-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/059-finalizer-throw/Android.bp b/test/059-finalizer-throw/Android.bp index 5bbac4b76d..4367eba156 100644 --- a/test/059-finalizer-throw/Android.bp +++ b/test/059-finalizer-throw/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-059-finalizer-throw-expected-stdout", ":art-run-test-059-finalizer-throw-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/061-out-of-memory/Android.bp b/test/061-out-of-memory/Android.bp index 9e2431432f..ed709e17aa 100644 --- a/test/061-out-of-memory/Android.bp +++ b/test/061-out-of-memory/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-061-out-of-memory-expected-stdout", ":art-run-test-061-out-of-memory-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/062-character-encodings/Android.bp b/test/062-character-encodings/Android.bp index 413313b026..c825f42380 100644 --- a/test/062-character-encodings/Android.bp +++ b/test/062-character-encodings/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-062-character-encodings-expected-stdout", ":art-run-test-062-character-encodings-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/063-process-manager/Android.bp b/test/063-process-manager/Android.bp index 5992a62ac2..18cddfa8de 100644 --- a/test/063-process-manager/Android.bp +++ b/test/063-process-manager/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-063-process-manager-expected-stdout", ":art-run-test-063-process-manager-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/067-preemptive-unpark/Android.bp b/test/067-preemptive-unpark/Android.bp index 26a62f8b48..b641360b1a 100644 --- a/test/067-preemptive-unpark/Android.bp +++ b/test/067-preemptive-unpark/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-067-preemptive-unpark-expected-stdout", ":art-run-test-067-preemptive-unpark-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/069-field-type/Android.bp b/test/069-field-type/Android.bp index 4f7acf7546..3240e98cad 100644 --- a/test/069-field-type/Android.bp +++ b/test/069-field-type/Android.bp @@ -31,6 +31,9 @@ java_test { ":art-run-test-069-field-type-expected-stdout", ":art-run-test-069-field-type-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/070-nio-buffer/Android.bp b/test/070-nio-buffer/Android.bp index cc2b763378..b626ec9f76 100644 --- a/test/070-nio-buffer/Android.bp +++ b/test/070-nio-buffer/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-070-nio-buffer-expected-stdout", ":art-run-test-070-nio-buffer-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/072-precise-gc/Android.bp b/test/072-precise-gc/Android.bp index 4ea8c2b8af..0c3e7b32f2 100644 --- a/test/072-precise-gc/Android.bp +++ b/test/072-precise-gc/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-072-precise-gc-expected-stdout", ":art-run-test-072-precise-gc-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/072-reachability-fence/Android.bp b/test/072-reachability-fence/Android.bp index f079377a5f..4eef0c3416 100644 --- a/test/072-reachability-fence/Android.bp +++ b/test/072-reachability-fence/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-072-reachability-fence-expected-stdout", ":art-run-test-072-reachability-fence-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/073-mismatched-field/Android.bp b/test/073-mismatched-field/Android.bp index 83f9d6d376..68cdf9cdfd 100644 --- a/test/073-mismatched-field/Android.bp +++ b/test/073-mismatched-field/Android.bp @@ -31,6 +31,9 @@ java_test { ":art-run-test-073-mismatched-field-expected-stdout", ":art-run-test-073-mismatched-field-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/074-gc-thrash/Android.bp b/test/074-gc-thrash/Android.bp index b6b99dbbdc..102ae0176e 100644 --- a/test/074-gc-thrash/Android.bp +++ b/test/074-gc-thrash/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-074-gc-thrash-expected-stdout", ":art-run-test-074-gc-thrash-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/075-verification-error/Android.bp b/test/075-verification-error/Android.bp index 6d024a9d40..2e43e013b5 100644 --- a/test/075-verification-error/Android.bp +++ b/test/075-verification-error/Android.bp @@ -31,6 +31,9 @@ java_test { ":art-run-test-075-verification-error-expected-stdout", ":art-run-test-075-verification-error-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/076-boolean-put/Android.bp b/test/076-boolean-put/Android.bp index 5fa8baf044..c3f0f1a1fb 100644 --- a/test/076-boolean-put/Android.bp +++ b/test/076-boolean-put/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-076-boolean-put-expected-stdout", ":art-run-test-076-boolean-put-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/077-method-override/Android.bp b/test/077-method-override/Android.bp index 0bf8ecc7e0..267ca19a5f 100644 --- a/test/077-method-override/Android.bp +++ b/test/077-method-override/Android.bp @@ -31,6 +31,9 @@ java_test { ":art-run-test-077-method-override-expected-stdout", ":art-run-test-077-method-override-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/078-polymorphic-virtual/Android.bp b/test/078-polymorphic-virtual/Android.bp index e71ab37543..6968bb626c 100644 --- a/test/078-polymorphic-virtual/Android.bp +++ b/test/078-polymorphic-virtual/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-078-polymorphic-virtual-expected-stdout", ":art-run-test-078-polymorphic-virtual-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/079-phantom/Android.bp b/test/079-phantom/Android.bp index 11c978bd9b..5d684be047 100644 --- a/test/079-phantom/Android.bp +++ b/test/079-phantom/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-079-phantom-expected-stdout", ":art-run-test-079-phantom-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/080-oom-fragmentation/Android.bp b/test/080-oom-fragmentation/Android.bp index c81f798e05..02868f87c9 100644 --- a/test/080-oom-fragmentation/Android.bp +++ b/test/080-oom-fragmentation/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-080-oom-fragmentation-expected-stdout", ":art-run-test-080-oom-fragmentation-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/080-oom-throw-with-finalizer/Android.bp b/test/080-oom-throw-with-finalizer/Android.bp index 7f7668e97f..53a9d581f2 100644 --- a/test/080-oom-throw-with-finalizer/Android.bp +++ b/test/080-oom-throw-with-finalizer/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-080-oom-throw-with-finalizer-expected-stdout", ":art-run-test-080-oom-throw-with-finalizer-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/080-oom-throw/Android.bp b/test/080-oom-throw/Android.bp index 6e07adcd9f..4281be8ff5 100644 --- a/test/080-oom-throw/Android.bp +++ b/test/080-oom-throw/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-080-oom-throw-expected-stdout", ":art-run-test-080-oom-throw-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/081-hot-exceptions/Android.bp b/test/081-hot-exceptions/Android.bp index 4d4bb04704..e82ed96890 100644 --- a/test/081-hot-exceptions/Android.bp +++ b/test/081-hot-exceptions/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-081-hot-exceptions-expected-stdout", ":art-run-test-081-hot-exceptions-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/082-inline-execute/Android.bp b/test/082-inline-execute/Android.bp index 492bbffac8..0b7a41a123 100644 --- a/test/082-inline-execute/Android.bp +++ b/test/082-inline-execute/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-082-inline-execute-expected-stdout", ":art-run-test-082-inline-execute-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/083-compiler-regressions/Android.bp b/test/083-compiler-regressions/Android.bp index cd985731ab..bb6676c950 100644 --- a/test/083-compiler-regressions/Android.bp +++ b/test/083-compiler-regressions/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-083-compiler-regressions-expected-stdout", ":art-run-test-083-compiler-regressions-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/084-class-init/Android.bp b/test/084-class-init/Android.bp index dd89fda639..95bbe91c33 100644 --- a/test/084-class-init/Android.bp +++ b/test/084-class-init/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-084-class-init-expected-stdout", ":art-run-test-084-class-init-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/090-loop-formation/Android.bp b/test/090-loop-formation/Android.bp index 7e908c7531..b1d5f4be93 100644 --- a/test/090-loop-formation/Android.bp +++ b/test/090-loop-formation/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-090-loop-formation-expected-stdout", ":art-run-test-090-loop-formation-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/092-locale/Android.bp b/test/092-locale/Android.bp index cc3f6f2b71..397f6db51d 100644 --- a/test/092-locale/Android.bp +++ b/test/092-locale/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-092-locale-expected-stdout", ":art-run-test-092-locale-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/093-serialization/Android.bp b/test/093-serialization/Android.bp index 83ae42a401..d58741dcf0 100644 --- a/test/093-serialization/Android.bp +++ b/test/093-serialization/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-093-serialization-expected-stdout", ":art-run-test-093-serialization-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/094-pattern/Android.bp b/test/094-pattern/Android.bp index 892154c5fb..06c9f0f4f2 100644 --- a/test/094-pattern/Android.bp +++ b/test/094-pattern/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-094-pattern-expected-stdout", ":art-run-test-094-pattern-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/095-switch-MAX_INT/Android.bp b/test/095-switch-MAX_INT/Android.bp index 0210d4f6e2..01739c2a97 100644 --- a/test/095-switch-MAX_INT/Android.bp +++ b/test/095-switch-MAX_INT/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-095-switch-MAX_INT-expected-stdout", ":art-run-test-095-switch-MAX_INT-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/096-array-copy-concurrent-gc/Android.bp b/test/096-array-copy-concurrent-gc/Android.bp index e65cdfbd8b..7036f71d4d 100644 --- a/test/096-array-copy-concurrent-gc/Android.bp +++ b/test/096-array-copy-concurrent-gc/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-096-array-copy-concurrent-gc-expected-stdout", ":art-run-test-096-array-copy-concurrent-gc-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/099-vmdebug/Android.bp b/test/099-vmdebug/Android.bp index a2ba9b40cc..e27ac5a5e4 100644 --- a/test/099-vmdebug/Android.bp +++ b/test/099-vmdebug/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-099-vmdebug-expected-stdout", ":art-run-test-099-vmdebug-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/100-reflect2/Android.bp b/test/100-reflect2/Android.bp index c2ed58f99c..facfb01bcd 100644 --- a/test/100-reflect2/Android.bp +++ b/test/100-reflect2/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-100-reflect2-expected-stdout", ":art-run-test-100-reflect2-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/1000-non-moving-space-stress/Android.bp b/test/1000-non-moving-space-stress/Android.bp index 976780a467..d80b3008bf 100644 --- a/test/1000-non-moving-space-stress/Android.bp +++ b/test/1000-non-moving-space-stress/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-1000-non-moving-space-stress-expected-stdout", ":art-run-test-1000-non-moving-space-stress-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/1004-checker-volatile-ref-load/Android.bp b/test/1004-checker-volatile-ref-load/Android.bp index 6c524d0926..42e5568232 100644 --- a/test/1004-checker-volatile-ref-load/Android.bp +++ b/test/1004-checker-volatile-ref-load/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-1004-checker-volatile-ref-load-expected-stdout", ":art-run-test-1004-checker-volatile-ref-load-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/101-fibonacci/Android.bp b/test/101-fibonacci/Android.bp index 3a37d1fc85..9cb2eabb66 100644 --- a/test/101-fibonacci/Android.bp +++ b/test/101-fibonacci/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-101-fibonacci-expected-stdout", ":art-run-test-101-fibonacci-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/102-concurrent-gc/Android.bp b/test/102-concurrent-gc/Android.bp index 2409aef091..fe1ff5615c 100644 --- a/test/102-concurrent-gc/Android.bp +++ b/test/102-concurrent-gc/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-102-concurrent-gc-expected-stdout", ":art-run-test-102-concurrent-gc-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/103-string-append/Android.bp b/test/103-string-append/Android.bp index ccef18ae3a..77b27a4639 100644 --- a/test/103-string-append/Android.bp +++ b/test/103-string-append/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-103-string-append-expected-stdout", ":art-run-test-103-string-append-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/104-growth-limit/Android.bp b/test/104-growth-limit/Android.bp index 88204726f8..f557a8b860 100644 --- a/test/104-growth-limit/Android.bp +++ b/test/104-growth-limit/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-104-growth-limit-expected-stdout", ":art-run-test-104-growth-limit-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/105-invoke/Android.bp b/test/105-invoke/Android.bp index 89c9bdf235..6d5d339b10 100644 --- a/test/105-invoke/Android.bp +++ b/test/105-invoke/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-105-invoke-expected-stdout", ":art-run-test-105-invoke-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/106-exceptions2/Android.bp b/test/106-exceptions2/Android.bp index e5c3427eef..ecdc165b47 100644 --- a/test/106-exceptions2/Android.bp +++ b/test/106-exceptions2/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-106-exceptions2-expected-stdout", ":art-run-test-106-exceptions2-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/107-int-math2/Android.bp b/test/107-int-math2/Android.bp index 930909f010..a63917e8a6 100644 --- a/test/107-int-math2/Android.bp +++ b/test/107-int-math2/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-107-int-math2-expected-stdout", ":art-run-test-107-int-math2-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/108-check-cast/Android.bp b/test/108-check-cast/Android.bp index fa5d730440..48926c4cb2 100644 --- a/test/108-check-cast/Android.bp +++ b/test/108-check-cast/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-108-check-cast-expected-stdout", ":art-run-test-108-check-cast-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/109-suspend-check/Android.bp b/test/109-suspend-check/Android.bp index 4312e151c9..ee5e3d40bd 100644 --- a/test/109-suspend-check/Android.bp +++ b/test/109-suspend-check/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-109-suspend-check-expected-stdout", ":art-run-test-109-suspend-check-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/110-field-access/Android.bp b/test/110-field-access/Android.bp index 3e67facc97..a5c1099ae8 100644 --- a/test/110-field-access/Android.bp +++ b/test/110-field-access/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-110-field-access-expected-stdout", ":art-run-test-110-field-access-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/112-double-math/Android.bp b/test/112-double-math/Android.bp index 2c16776006..6f8e666469 100644 --- a/test/112-double-math/Android.bp +++ b/test/112-double-math/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-112-double-math-expected-stdout", ":art-run-test-112-double-math-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/114-ParallelGC/Android.bp b/test/114-ParallelGC/Android.bp index bae03cc3a6..0d875b0d85 100644 --- a/test/114-ParallelGC/Android.bp +++ b/test/114-ParallelGC/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-114-ParallelGC-expected-stdout", ":art-run-test-114-ParallelGC-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/120-hashcode/Android.bp b/test/120-hashcode/Android.bp index 453893ab0d..df9f0c3f6c 100644 --- a/test/120-hashcode/Android.bp +++ b/test/120-hashcode/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-120-hashcode-expected-stdout", ":art-run-test-120-hashcode-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/121-simple-suspend-check/Android.bp b/test/121-simple-suspend-check/Android.bp index 22821fe0d5..2806d02421 100644 --- a/test/121-simple-suspend-check/Android.bp +++ b/test/121-simple-suspend-check/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-121-simple-suspend-check-expected-stdout", ":art-run-test-121-simple-suspend-check-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/122-npe/Android.bp b/test/122-npe/Android.bp index fba593ddc4..afa5a3bcfa 100644 --- a/test/122-npe/Android.bp +++ b/test/122-npe/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-122-npe-expected-stdout", ":art-run-test-122-npe-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/123-compiler-regressions-mt/Android.bp b/test/123-compiler-regressions-mt/Android.bp index 7c50958a69..b6e4e72de2 100644 --- a/test/123-compiler-regressions-mt/Android.bp +++ b/test/123-compiler-regressions-mt/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-123-compiler-regressions-mt-expected-stdout", ":art-run-test-123-compiler-regressions-mt-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/123-inline-execute2/Android.bp b/test/123-inline-execute2/Android.bp index 146d9c245c..56bcf03e51 100644 --- a/test/123-inline-execute2/Android.bp +++ b/test/123-inline-execute2/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-123-inline-execute2-expected-stdout", ":art-run-test-123-inline-execute2-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/125-gc-and-classloading/Android.bp b/test/125-gc-and-classloading/Android.bp index 64a7a55006..bdc3b45900 100644 --- a/test/125-gc-and-classloading/Android.bp +++ b/test/125-gc-and-classloading/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-125-gc-and-classloading-expected-stdout", ":art-run-test-125-gc-and-classloading-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/128-reg-spill-on-implicit-nullcheck/Android.bp b/test/128-reg-spill-on-implicit-nullcheck/Android.bp index 2dea4ad8fc..693b91d53f 100644 --- a/test/128-reg-spill-on-implicit-nullcheck/Android.bp +++ b/test/128-reg-spill-on-implicit-nullcheck/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-128-reg-spill-on-implicit-nullcheck-expected-stdout", ":art-run-test-128-reg-spill-on-implicit-nullcheck-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/129-ThreadGetId/Android.bp b/test/129-ThreadGetId/Android.bp index 85f64002e4..f64ef97288 100644 --- a/test/129-ThreadGetId/Android.bp +++ b/test/129-ThreadGetId/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-129-ThreadGetId-expected-stdout", ":art-run-test-129-ThreadGetId-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/132-daemon-locks-shutdown/Android.bp b/test/132-daemon-locks-shutdown/Android.bp index e4421818db..3884c3b4e2 100644 --- a/test/132-daemon-locks-shutdown/Android.bp +++ b/test/132-daemon-locks-shutdown/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-132-daemon-locks-shutdown-expected-stdout", ":art-run-test-132-daemon-locks-shutdown-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/133-static-invoke-super/Android.bp b/test/133-static-invoke-super/Android.bp index 5b24c4e135..7dc637b866 100644 --- a/test/133-static-invoke-super/Android.bp +++ b/test/133-static-invoke-super/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-133-static-invoke-super-expected-stdout", ":art-run-test-133-static-invoke-super-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/1338-gc-no-los/Android.bp b/test/1338-gc-no-los/Android.bp index f1f8344a9e..c8869f1320 100644 --- a/test/1338-gc-no-los/Android.bp +++ b/test/1338-gc-no-los/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-1338-gc-no-los-expected-stdout", ":art-run-test-1338-gc-no-los-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/140-dce-regression/Android.bp b/test/140-dce-regression/Android.bp index 796fe3c846..f597e7ff30 100644 --- a/test/140-dce-regression/Android.bp +++ b/test/140-dce-regression/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-140-dce-regression-expected-stdout", ":art-run-test-140-dce-regression-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/140-field-packing/Android.bp b/test/140-field-packing/Android.bp index 82ce2f97fa..611fa9408c 100644 --- a/test/140-field-packing/Android.bp +++ b/test/140-field-packing/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-140-field-packing-expected-stdout", ":art-run-test-140-field-packing-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/143-string-value/Android.bp b/test/143-string-value/Android.bp index 86d2877556..fa2d4c3ee4 100644 --- a/test/143-string-value/Android.bp +++ b/test/143-string-value/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-143-string-value-expected-stdout", ":art-run-test-143-string-value-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/145-alloc-tracking-stress/Android.bp b/test/145-alloc-tracking-stress/Android.bp index 5250e5037e..4296ecbfb7 100644 --- a/test/145-alloc-tracking-stress/Android.bp +++ b/test/145-alloc-tracking-stress/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-145-alloc-tracking-stress-expected-stdout", ":art-run-test-145-alloc-tracking-stress-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/152-dead-large-object/Android.bp b/test/152-dead-large-object/Android.bp index 010deb8304..e7f15bd27a 100644 --- a/test/152-dead-large-object/Android.bp +++ b/test/152-dead-large-object/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-152-dead-large-object-expected-stdout", ":art-run-test-152-dead-large-object-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/153-reference-stress/Android.bp b/test/153-reference-stress/Android.bp index ec9c6e9c43..3d8c037e7a 100644 --- a/test/153-reference-stress/Android.bp +++ b/test/153-reference-stress/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-153-reference-stress-expected-stdout", ":art-run-test-153-reference-stress-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/156-register-dex-file-multi-loader/Android.bp b/test/156-register-dex-file-multi-loader/Android.bp index 0f49bfebf2..56bd15eab4 100644 --- a/test/156-register-dex-file-multi-loader/Android.bp +++ b/test/156-register-dex-file-multi-loader/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-156-register-dex-file-multi-loader-expected-stdout", ":art-run-test-156-register-dex-file-multi-loader-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/159-app-image-fields/Android.bp b/test/159-app-image-fields/Android.bp index 89d35ef6f4..4f730d7d0f 100644 --- a/test/159-app-image-fields/Android.bp +++ b/test/159-app-image-fields/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-159-app-image-fields-expected-stdout", ":art-run-test-159-app-image-fields-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/160-read-barrier-stress/Android.bp b/test/160-read-barrier-stress/Android.bp index 64b87e6339..231420febd 100644 --- a/test/160-read-barrier-stress/Android.bp +++ b/test/160-read-barrier-stress/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-160-read-barrier-stress-expected-stdout", ":art-run-test-160-read-barrier-stress-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/163-app-image-methods/Android.bp b/test/163-app-image-methods/Android.bp index 57376629cd..a0a6f7f7bd 100644 --- a/test/163-app-image-methods/Android.bp +++ b/test/163-app-image-methods/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-163-app-image-methods-expected-stdout", ":art-run-test-163-app-image-methods-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/165-lock-owner-proxy/Android.bp b/test/165-lock-owner-proxy/Android.bp index dc30150fcc..a57d32815e 100644 --- a/test/165-lock-owner-proxy/Android.bp +++ b/test/165-lock-owner-proxy/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-165-lock-owner-proxy-expected-stdout", ":art-run-test-165-lock-owner-proxy-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/168-vmstack-annotated/Android.bp b/test/168-vmstack-annotated/Android.bp index 34f22d8dd2..441472be89 100644 --- a/test/168-vmstack-annotated/Android.bp +++ b/test/168-vmstack-annotated/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-168-vmstack-annotated-expected-stdout", ":art-run-test-168-vmstack-annotated-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/170-interface-init/Android.bp b/test/170-interface-init/Android.bp index 60d5e49f4d..d2aa5c8736 100644 --- a/test/170-interface-init/Android.bp +++ b/test/170-interface-init/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-170-interface-init-expected-stdout", ":art-run-test-170-interface-init-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/174-escaping-instance-of-bad-class/Android.bp b/test/174-escaping-instance-of-bad-class/Android.bp index f31993099c..ba22bbcb5d 100644 --- a/test/174-escaping-instance-of-bad-class/Android.bp +++ b/test/174-escaping-instance-of-bad-class/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-174-escaping-instance-of-bad-class-expected-stdout", ":art-run-test-174-escaping-instance-of-bad-class-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/175-alloc-big-bignums/Android.bp b/test/175-alloc-big-bignums/Android.bp index 77fdb12c4e..fde9021265 100644 --- a/test/175-alloc-big-bignums/Android.bp +++ b/test/175-alloc-big-bignums/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-175-alloc-big-bignums-expected-stdout", ":art-run-test-175-alloc-big-bignums-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/176-app-image-string/Android.bp b/test/176-app-image-string/Android.bp index 3dae355918..10464b7ae0 100644 --- a/test/176-app-image-string/Android.bp +++ b/test/176-app-image-string/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-176-app-image-string-expected-stdout", ":art-run-test-176-app-image-string-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/182-method-linking/Android.bp b/test/182-method-linking/Android.bp index 699b75b67d..66187ac571 100644 --- a/test/182-method-linking/Android.bp +++ b/test/182-method-linking/Android.bp @@ -31,6 +31,9 @@ java_test { ":art-run-test-182-method-linking-expected-stdout", ":art-run-test-182-method-linking-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/1960-checker-bounds-codegen/Android.bp b/test/1960-checker-bounds-codegen/Android.bp index efb2b490ce..0ecdb0ddee 100644 --- a/test/1960-checker-bounds-codegen/Android.bp +++ b/test/1960-checker-bounds-codegen/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-1960-checker-bounds-codegen-expected-stdout", ":art-run-test-1960-checker-bounds-codegen-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/1961-checker-loop-vectorizer/Android.bp b/test/1961-checker-loop-vectorizer/Android.bp index 43bb4b9dca..7802a060de 100644 --- a/test/1961-checker-loop-vectorizer/Android.bp +++ b/test/1961-checker-loop-vectorizer/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-1961-checker-loop-vectorizer-expected-stdout", ":art-run-test-1961-checker-loop-vectorizer-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/201-built-in-except-detail-messages/Android.bp b/test/201-built-in-except-detail-messages/Android.bp index 894dfb05db..73f8e55f0b 100644 --- a/test/201-built-in-except-detail-messages/Android.bp +++ b/test/201-built-in-except-detail-messages/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-201-built-in-except-detail-messages-expected-stdout", ":art-run-test-201-built-in-except-detail-messages-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2019-constantcalculationsinking/Android.bp b/test/2019-constantcalculationsinking/Android.bp index d9b323b5b0..f0fda417c4 100644 --- a/test/2019-constantcalculationsinking/Android.bp +++ b/test/2019-constantcalculationsinking/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2019-constantcalculationsinking-expected-stdout", ":art-run-test-2019-constantcalculationsinking-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/202-thread-oome/Android.bp b/test/202-thread-oome/Android.bp index d54443223f..f250b8f005 100644 --- a/test/202-thread-oome/Android.bp +++ b/test/202-thread-oome/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-202-thread-oome-expected-stdout", ":art-run-test-202-thread-oome-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2020-InvokeVirtual-Inlining/Android.bp b/test/2020-InvokeVirtual-Inlining/Android.bp index 2e62ccbe77..04996e0b74 100644 --- a/test/2020-InvokeVirtual-Inlining/Android.bp +++ b/test/2020-InvokeVirtual-Inlining/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2020-InvokeVirtual-Inlining-expected-stdout", ":art-run-test-2020-InvokeVirtual-Inlining-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2021-InvokeStatic-Inlining/Android.bp b/test/2021-InvokeStatic-Inlining/Android.bp index f9e265fe68..61924ca24c 100644 --- a/test/2021-InvokeStatic-Inlining/Android.bp +++ b/test/2021-InvokeStatic-Inlining/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2021-InvokeStatic-Inlining-expected-stdout", ":art-run-test-2021-InvokeStatic-Inlining-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2022-Invariantloops/Android.bp b/test/2022-Invariantloops/Android.bp index e477d903aa..14b480ac73 100644 --- a/test/2022-Invariantloops/Android.bp +++ b/test/2022-Invariantloops/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2022-Invariantloops-expected-stdout", ":art-run-test-2022-Invariantloops-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2023-InvariantLoops_typecast/Android.bp b/test/2023-InvariantLoops_typecast/Android.bp index 27aa9bfa9c..9b09b4399c 100644 --- a/test/2023-InvariantLoops_typecast/Android.bp +++ b/test/2023-InvariantLoops_typecast/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2023-InvariantLoops_typecast-expected-stdout", ":art-run-test-2023-InvariantLoops_typecast-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2024-InvariantNegativeLoop/Android.bp b/test/2024-InvariantNegativeLoop/Android.bp index 707aab6349..b688502316 100644 --- a/test/2024-InvariantNegativeLoop/Android.bp +++ b/test/2024-InvariantNegativeLoop/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2024-InvariantNegativeLoop-expected-stdout", ":art-run-test-2024-InvariantNegativeLoop-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2025-ChangedArrayValue/Android.bp b/test/2025-ChangedArrayValue/Android.bp index 451b86215d..bf3b826dad 100644 --- a/test/2025-ChangedArrayValue/Android.bp +++ b/test/2025-ChangedArrayValue/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2025-ChangedArrayValue-expected-stdout", ":art-run-test-2025-ChangedArrayValue-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2026-DifferentMemoryLSCouples/Android.bp b/test/2026-DifferentMemoryLSCouples/Android.bp index 1bdad83fb0..1994cbb393 100644 --- a/test/2026-DifferentMemoryLSCouples/Android.bp +++ b/test/2026-DifferentMemoryLSCouples/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2026-DifferentMemoryLSCouples-expected-stdout", ":art-run-test-2026-DifferentMemoryLSCouples-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2027-TwiceTheSameMemoryCouple/Android.bp b/test/2027-TwiceTheSameMemoryCouple/Android.bp index 1c66124f9f..45a0ac6b0b 100644 --- a/test/2027-TwiceTheSameMemoryCouple/Android.bp +++ b/test/2027-TwiceTheSameMemoryCouple/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2027-TwiceTheSameMemoryCouple-expected-stdout", ":art-run-test-2027-TwiceTheSameMemoryCouple-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2028-MultiBackward/Android.bp b/test/2028-MultiBackward/Android.bp index 4e031e5c2f..f179060adc 100644 --- a/test/2028-MultiBackward/Android.bp +++ b/test/2028-MultiBackward/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2028-MultiBackward-expected-stdout", ":art-run-test-2028-MultiBackward-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2029-contended-monitors/Android.bp b/test/2029-contended-monitors/Android.bp index fd27d42af9..3fbf04ae30 100644 --- a/test/2029-contended-monitors/Android.bp +++ b/test/2029-contended-monitors/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2029-contended-monitors-expected-stdout", ":art-run-test-2029-contended-monitors-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2030-long-running-child/Android.bp b/test/2030-long-running-child/Android.bp index aeba519395..74c11bb3c5 100644 --- a/test/2030-long-running-child/Android.bp +++ b/test/2030-long-running-child/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2030-long-running-child-expected-stdout", ":art-run-test-2030-long-running-child-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2042-checker-dce-always-throw/Android.bp b/test/2042-checker-dce-always-throw/Android.bp index f991939b27..9475c08de7 100644 --- a/test/2042-checker-dce-always-throw/Android.bp +++ b/test/2042-checker-dce-always-throw/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2042-checker-dce-always-throw-expected-stdout", ":art-run-test-2042-checker-dce-always-throw-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2042-reference-processing/Android.bp b/test/2042-reference-processing/Android.bp index a73b8d0bd0..0e73d8a87d 100644 --- a/test/2042-reference-processing/Android.bp +++ b/test/2042-reference-processing/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2042-reference-processing-expected-stdout", ":art-run-test-2042-reference-processing-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2043-reference-pauses/Android.bp b/test/2043-reference-pauses/Android.bp index a84aea25e8..3ae9d8838e 100644 --- a/test/2043-reference-pauses/Android.bp +++ b/test/2043-reference-pauses/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2043-reference-pauses-expected-stdout", ":art-run-test-2043-reference-pauses-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2044-get-stack-traces/Android.bp b/test/2044-get-stack-traces/Android.bp index 79aea7c7ff..7f216b45fc 100644 --- a/test/2044-get-stack-traces/Android.bp +++ b/test/2044-get-stack-traces/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2044-get-stack-traces-expected-stdout", ":art-run-test-2044-get-stack-traces-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2046-checker-comparison/Android.bp b/test/2046-checker-comparison/Android.bp index edd776184d..ac5849a8a4 100644 --- a/test/2046-checker-comparison/Android.bp +++ b/test/2046-checker-comparison/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2046-checker-comparison-expected-stdout", ":art-run-test-2046-checker-comparison-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2047-checker-const-string-length/Android.bp b/test/2047-checker-const-string-length/Android.bp index 41cbfd3b8a..b3df9ee4d7 100644 --- a/test/2047-checker-const-string-length/Android.bp +++ b/test/2047-checker-const-string-length/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2047-checker-const-string-length-expected-stdout", ":art-run-test-2047-checker-const-string-length-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2231-checker-heap-poisoning/Android.bp b/test/2231-checker-heap-poisoning/Android.bp index b2623e3238..3f8761dc19 100644 --- a/test/2231-checker-heap-poisoning/Android.bp +++ b/test/2231-checker-heap-poisoning/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2231-checker-heap-poisoning-expected-stdout", ":art-run-test-2231-checker-heap-poisoning-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2233-checker-remove-loop-suspend-check/Android.bp b/test/2233-checker-remove-loop-suspend-check/Android.bp index f581ee34c0..7f59665959 100644 --- a/test/2233-checker-remove-loop-suspend-check/Android.bp +++ b/test/2233-checker-remove-loop-suspend-check/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2233-checker-remove-loop-suspend-check-expected-stdout", ":art-run-test-2233-checker-remove-loop-suspend-check-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2234-checker-remove-entry-suspendcheck/Android.bp b/test/2234-checker-remove-entry-suspendcheck/Android.bp index 31dc1dec3e..5c28b72ffd 100644 --- a/test/2234-checker-remove-entry-suspendcheck/Android.bp +++ b/test/2234-checker-remove-entry-suspendcheck/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2234-checker-remove-entry-suspendcheck-expected-stdout", ":art-run-test-2234-checker-remove-entry-suspendcheck-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2236-JdkUnsafeGetLong-regression/Android.bp b/test/2236-JdkUnsafeGetLong-regression/Android.bp index 403cab8608..4f022da0d7 100644 --- a/test/2236-JdkUnsafeGetLong-regression/Android.bp +++ b/test/2236-JdkUnsafeGetLong-regression/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2236-JdkUnsafeGetLong-regression-expected-stdout", ":art-run-test-2236-JdkUnsafeGetLong-regression-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2241-checker-inline-try-catch/Android.bp b/test/2241-checker-inline-try-catch/Android.bp index 15708d6744..7c6ee45895 100644 --- a/test/2241-checker-inline-try-catch/Android.bp +++ b/test/2241-checker-inline-try-catch/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2241-checker-inline-try-catch-expected-stdout", ":art-run-test-2241-checker-inline-try-catch-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2242-checker-lse-acquire-release-operations/Android.bp b/test/2242-checker-lse-acquire-release-operations/Android.bp index bb493ce284..1c1c851358 100644 --- a/test/2242-checker-lse-acquire-release-operations/Android.bp +++ b/test/2242-checker-lse-acquire-release-operations/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2242-checker-lse-acquire-release-operations-expected-stdout", ":art-run-test-2242-checker-lse-acquire-release-operations-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2243-checker-not-inline-into-throw/Android.bp b/test/2243-checker-not-inline-into-throw/Android.bp index 78c5c66336..2e9bf470c7 100644 --- a/test/2243-checker-not-inline-into-throw/Android.bp +++ b/test/2243-checker-not-inline-into-throw/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2243-checker-not-inline-into-throw-expected-stdout", ":art-run-test-2243-checker-not-inline-into-throw-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2244-checker-remove-try-boundary/Android.bp b/test/2244-checker-remove-try-boundary/Android.bp index 9e03692808..faffd46e8a 100644 --- a/test/2244-checker-remove-try-boundary/Android.bp +++ b/test/2244-checker-remove-try-boundary/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2244-checker-remove-try-boundary-expected-stdout", ":art-run-test-2244-checker-remove-try-boundary-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2247-checker-write-barrier-elimination/Android.bp b/test/2247-checker-write-barrier-elimination/Android.bp index c9744e9b00..89d1849ebc 100644 --- a/test/2247-checker-write-barrier-elimination/Android.bp +++ b/test/2247-checker-write-barrier-elimination/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2247-checker-write-barrier-elimination-expected-stdout", ":art-run-test-2247-checker-write-barrier-elimination-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2249-checker-return-try-boundary-exit-in-loop/Android.bp b/test/2249-checker-return-try-boundary-exit-in-loop/Android.bp index 3bc249e501..111f60995e 100644 --- a/test/2249-checker-return-try-boundary-exit-in-loop/Android.bp +++ b/test/2249-checker-return-try-boundary-exit-in-loop/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2249-checker-return-try-boundary-exit-in-loop-expected-stdout", ":art-run-test-2249-checker-return-try-boundary-exit-in-loop-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2250-inline-throw-into-try/Android.bp b/test/2250-inline-throw-into-try/Android.bp index 6a0a7d6577..b787d9e846 100644 --- a/test/2250-inline-throw-into-try/Android.bp +++ b/test/2250-inline-throw-into-try/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2250-inline-throw-into-try-expected-stdout", ":art-run-test-2250-inline-throw-into-try-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2252-rem-optimization-dividend-divisor/Android.bp b/test/2252-rem-optimization-dividend-divisor/Android.bp index 75dad8a44d..f69f29e9eb 100644 --- a/test/2252-rem-optimization-dividend-divisor/Android.bp +++ b/test/2252-rem-optimization-dividend-divisor/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2252-rem-optimization-dividend-divisor-expected-stdout", ":art-run-test-2252-rem-optimization-dividend-divisor-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2253-checker-devirtualize-always-throws/Android.bp b/test/2253-checker-devirtualize-always-throws/Android.bp index c818281f5e..77bb70e54a 100644 --- a/test/2253-checker-devirtualize-always-throws/Android.bp +++ b/test/2253-checker-devirtualize-always-throws/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2253-checker-devirtualize-always-throws-expected-stdout", ":art-run-test-2253-checker-devirtualize-always-throws-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2254-checker-not-var-analyzed-pathological/Android.bp b/test/2254-checker-not-var-analyzed-pathological/Android.bp index deb5c93f41..324e17fdd8 100644 --- a/test/2254-checker-not-var-analyzed-pathological/Android.bp +++ b/test/2254-checker-not-var-analyzed-pathological/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2254-checker-not-var-analyzed-pathological-expected-stdout", ":art-run-test-2254-checker-not-var-analyzed-pathological-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2254-class-value-before-and-after-u/Android.bp b/test/2254-class-value-before-and-after-u/Android.bp index 25c25fb00e..771045d0e8 100644 --- a/test/2254-class-value-before-and-after-u/Android.bp +++ b/test/2254-class-value-before-and-after-u/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2254-class-value-before-and-after-u-expected-stdout", ":art-run-test-2254-class-value-before-and-after-u-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2255-checker-branch-redirection/Android.bp b/test/2255-checker-branch-redirection/Android.bp index b7ac541472..528956e5f1 100644 --- a/test/2255-checker-branch-redirection/Android.bp +++ b/test/2255-checker-branch-redirection/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2255-checker-branch-redirection-expected-stdout", ":art-run-test-2255-checker-branch-redirection-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2256-checker-vector-replacement/Android.bp b/test/2256-checker-vector-replacement/Android.bp index b475493523..16432f55e2 100644 --- a/test/2256-checker-vector-replacement/Android.bp +++ b/test/2256-checker-vector-replacement/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2256-checker-vector-replacement-expected-stdout", ":art-run-test-2256-checker-vector-replacement-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2257-checker-constant-folding-before-codegen/Android.bp b/test/2257-checker-constant-folding-before-codegen/Android.bp index 3326c5f8e6..40fba9c13a 100644 --- a/test/2257-checker-constant-folding-before-codegen/Android.bp +++ b/test/2257-checker-constant-folding-before-codegen/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2257-checker-constant-folding-before-codegen-expected-stdout", ":art-run-test-2257-checker-constant-folding-before-codegen-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2258-checker-valid-rti/Android.bp b/test/2258-checker-valid-rti/Android.bp index 701835dd34..11e457e1db 100644 --- a/test/2258-checker-valid-rti/Android.bp +++ b/test/2258-checker-valid-rti/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2258-checker-valid-rti-expected-stdout", ":art-run-test-2258-checker-valid-rti-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2259-checker-code-sinking-infinite-try-catch/Android.bp b/test/2259-checker-code-sinking-infinite-try-catch/Android.bp index ab53ee38ee..28620687d3 100644 --- a/test/2259-checker-code-sinking-infinite-try-catch/Android.bp +++ b/test/2259-checker-code-sinking-infinite-try-catch/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2259-checker-code-sinking-infinite-try-catch-expected-stdout", ":art-run-test-2259-checker-code-sinking-infinite-try-catch-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2260-checker-inline-unimplemented-intrinsics/Android.bp b/test/2260-checker-inline-unimplemented-intrinsics/Android.bp index 7fca8e3ed7..9b789c7eeb 100644 --- a/test/2260-checker-inline-unimplemented-intrinsics/Android.bp +++ b/test/2260-checker-inline-unimplemented-intrinsics/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2260-checker-inline-unimplemented-intrinsics-expected-stdout", ":art-run-test-2260-checker-inline-unimplemented-intrinsics-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2262-checker-return-sinking/Android.bp b/test/2262-checker-return-sinking/Android.bp index 1eaadd6dd3..19a65597d4 100644 --- a/test/2262-checker-return-sinking/Android.bp +++ b/test/2262-checker-return-sinking/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2262-checker-return-sinking-expected-stdout", ":art-run-test-2262-checker-return-sinking-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2265-checker-select-binary-unary/Android.bp b/test/2265-checker-select-binary-unary/Android.bp index 5267b1e07c..cbe3fd6df6 100644 --- a/test/2265-checker-select-binary-unary/Android.bp +++ b/test/2265-checker-select-binary-unary/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2265-checker-select-binary-unary-expected-stdout", ":art-run-test-2265-checker-select-binary-unary-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2266-checker-remove-empty-ifs/Android.bp b/test/2266-checker-remove-empty-ifs/Android.bp index 197ad300d7..989e4e80d0 100644 --- a/test/2266-checker-remove-empty-ifs/Android.bp +++ b/test/2266-checker-remove-empty-ifs/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2266-checker-remove-empty-ifs-expected-stdout", ":art-run-test-2266-checker-remove-empty-ifs-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2268-checker-remove-dead-phis/Android.bp b/test/2268-checker-remove-dead-phis/Android.bp index 85d16d151a..5163abcd7e 100644 --- a/test/2268-checker-remove-dead-phis/Android.bp +++ b/test/2268-checker-remove-dead-phis/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2268-checker-remove-dead-phis-expected-stdout", ":art-run-test-2268-checker-remove-dead-phis-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2269-checker-constant-folding-intrinsics/Android.bp b/test/2269-checker-constant-folding-intrinsics/Android.bp index cc4545f865..ca0d87c262 100644 --- a/test/2269-checker-constant-folding-intrinsics/Android.bp +++ b/test/2269-checker-constant-folding-intrinsics/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2269-checker-constant-folding-intrinsics-expected-stdout", ":art-run-test-2269-checker-constant-folding-intrinsics-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2273-checker-unreachable-intrinsics/Android.bp b/test/2273-checker-unreachable-intrinsics/Android.bp index be4dd29437..7dd167560d 100644 --- a/test/2273-checker-unreachable-intrinsics/Android.bp +++ b/test/2273-checker-unreachable-intrinsics/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2273-checker-unreachable-intrinsics-expected-stdout", ":art-run-test-2273-checker-unreachable-intrinsics-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2274-checker-bitwise-gvn/Android.bp b/test/2274-checker-bitwise-gvn/Android.bp index b2d0fd2742..d35f172172 100644 --- a/test/2274-checker-bitwise-gvn/Android.bp +++ b/test/2274-checker-bitwise-gvn/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2274-checker-bitwise-gvn-expected-stdout", ":art-run-test-2274-checker-bitwise-gvn-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2275-checker-empty-loops/Android.bp b/test/2275-checker-empty-loops/Android.bp index 95c18bd196..686d809eb1 100644 --- a/test/2275-checker-empty-loops/Android.bp +++ b/test/2275-checker-empty-loops/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2275-checker-empty-loops-expected-stdout", ":art-run-test-2275-checker-empty-loops-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/2275-integral-unsigned-arithmetic/Android.bp b/test/2275-integral-unsigned-arithmetic/Android.bp index 00770c8133..528d2afdf6 100644 --- a/test/2275-integral-unsigned-arithmetic/Android.bp +++ b/test/2275-integral-unsigned-arithmetic/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2275-integral-unsigned-arithmetic-expected-stdout", ":art-run-test-2275-integral-unsigned-arithmetic-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2278-nested-loops/Android.bp b/test/2278-nested-loops/Android.bp index 99120fe4fe..b072d73caf 100644 --- a/test/2278-nested-loops/Android.bp +++ b/test/2278-nested-loops/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2278-nested-loops-expected-stdout", ":art-run-test-2278-nested-loops-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2279-aconfig-flags/Android.bp b/test/2279-aconfig-flags/Android.bp index 6b1fcb49ee..876b0f1f98 100644 --- a/test/2279-aconfig-flags/Android.bp +++ b/test/2279-aconfig-flags/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2279-aconfig-flags-expected-stdout", ":art-run-test-2279-aconfig-flags-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/2279-second-inner-loop-references-first/Android.bp b/test/2279-second-inner-loop-references-first/Android.bp index c9ea73dcf2..2654f6b35c 100644 --- a/test/2279-second-inner-loop-references-first/Android.bp +++ b/test/2279-second-inner-loop-references-first/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-2279-second-inner-loop-references-first-expected-stdout", ":art-run-test-2279-second-inner-loop-references-first-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/300-package-override/Android.bp b/test/300-package-override/Android.bp index cbe94c420d..31c3aff7f5 100644 --- a/test/300-package-override/Android.bp +++ b/test/300-package-override/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-300-package-override-expected-stdout", ":art-run-test-300-package-override-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/301-abstract-protected/Android.bp b/test/301-abstract-protected/Android.bp index 02aae2d03c..ca370e5895 100644 --- a/test/301-abstract-protected/Android.bp +++ b/test/301-abstract-protected/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-301-abstract-protected-expected-stdout", ":art-run-test-301-abstract-protected-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/302-float-conversion/Android.bp b/test/302-float-conversion/Android.bp index ae5c76e0e4..db06307e71 100644 --- a/test/302-float-conversion/Android.bp +++ b/test/302-float-conversion/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-302-float-conversion-expected-stdout", ":art-run-test-302-float-conversion-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/304-method-tracing/Android.bp b/test/304-method-tracing/Android.bp index e6276031b8..9f6821d658 100644 --- a/test/304-method-tracing/Android.bp +++ b/test/304-method-tracing/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-304-method-tracing-expected-stdout", ":art-run-test-304-method-tracing-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/401-optimizing-compiler/Android.bp b/test/401-optimizing-compiler/Android.bp index 3335fca22d..145338ec96 100644 --- a/test/401-optimizing-compiler/Android.bp +++ b/test/401-optimizing-compiler/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-401-optimizing-compiler-expected-stdout", ":art-run-test-401-optimizing-compiler-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/402-optimizing-control-flow/Android.bp b/test/402-optimizing-control-flow/Android.bp index c2db8c6ebd..dc8423d1dd 100644 --- a/test/402-optimizing-control-flow/Android.bp +++ b/test/402-optimizing-control-flow/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-402-optimizing-control-flow-expected-stdout", ":art-run-test-402-optimizing-control-flow-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/403-optimizing-long/Android.bp b/test/403-optimizing-long/Android.bp index fda0fbbcc2..1215165e33 100644 --- a/test/403-optimizing-long/Android.bp +++ b/test/403-optimizing-long/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-403-optimizing-long-expected-stdout", ":art-run-test-403-optimizing-long-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/404-optimizing-allocator/Android.bp b/test/404-optimizing-allocator/Android.bp index 0cbef465d4..eb19765cac 100644 --- a/test/404-optimizing-allocator/Android.bp +++ b/test/404-optimizing-allocator/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-404-optimizing-allocator-expected-stdout", ":art-run-test-404-optimizing-allocator-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/405-optimizing-long-allocator/Android.bp b/test/405-optimizing-long-allocator/Android.bp index 50445c9cb4..5bc00526e1 100644 --- a/test/405-optimizing-long-allocator/Android.bp +++ b/test/405-optimizing-long-allocator/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-405-optimizing-long-allocator-expected-stdout", ":art-run-test-405-optimizing-long-allocator-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/406-fields/Android.bp b/test/406-fields/Android.bp index 8e6b3d1d4b..1f44b49bec 100644 --- a/test/406-fields/Android.bp +++ b/test/406-fields/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-406-fields-expected-stdout", ":art-run-test-406-fields-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/407-arrays/Android.bp b/test/407-arrays/Android.bp index 20be07d5ba..73d5705f93 100644 --- a/test/407-arrays/Android.bp +++ b/test/407-arrays/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-407-arrays-expected-stdout", ":art-run-test-407-arrays-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/408-move-bug/Android.bp b/test/408-move-bug/Android.bp index 828f5c7bd6..52a9e4665c 100644 --- a/test/408-move-bug/Android.bp +++ b/test/408-move-bug/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-408-move-bug-expected-stdout", ":art-run-test-408-move-bug-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/409-materialized-condition/Android.bp b/test/409-materialized-condition/Android.bp index 2aabaf2f45..4210240265 100644 --- a/test/409-materialized-condition/Android.bp +++ b/test/409-materialized-condition/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-409-materialized-condition-expected-stdout", ":art-run-test-409-materialized-condition-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/410-floats/Android.bp b/test/410-floats/Android.bp index 4fa1ad4382..2c5255905f 100644 --- a/test/410-floats/Android.bp +++ b/test/410-floats/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-410-floats-expected-stdout", ":art-run-test-410-floats-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/411-checker-hdiv-hrem-const/Android.bp b/test/411-checker-hdiv-hrem-const/Android.bp index 94cb1c884d..1fcebe1a2b 100644 --- a/test/411-checker-hdiv-hrem-const/Android.bp +++ b/test/411-checker-hdiv-hrem-const/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-411-checker-hdiv-hrem-const-expected-stdout", ":art-run-test-411-checker-hdiv-hrem-const-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/411-checker-hdiv-hrem-pow2/Android.bp b/test/411-checker-hdiv-hrem-pow2/Android.bp index 734a28fde6..0f41582b1d 100644 --- a/test/411-checker-hdiv-hrem-pow2/Android.bp +++ b/test/411-checker-hdiv-hrem-pow2/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-411-checker-hdiv-hrem-pow2-expected-stdout", ":art-run-test-411-checker-hdiv-hrem-pow2-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/411-checker-instruct-simplifier-hrem/Android.bp b/test/411-checker-instruct-simplifier-hrem/Android.bp index 2d2a221a00..08cf3b735d 100644 --- a/test/411-checker-instruct-simplifier-hrem/Android.bp +++ b/test/411-checker-instruct-simplifier-hrem/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-411-checker-instruct-simplifier-hrem-expected-stdout", ":art-run-test-411-checker-instruct-simplifier-hrem-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/411-optimizing-arith/Android.bp b/test/411-optimizing-arith/Android.bp index 1a9b2042f6..a8f4397a3c 100644 --- a/test/411-optimizing-arith/Android.bp +++ b/test/411-optimizing-arith/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-411-optimizing-arith-expected-stdout", ":art-run-test-411-optimizing-arith-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/413-regalloc-regression/Android.bp b/test/413-regalloc-regression/Android.bp index 6ff8d95a8c..16af8d5aad 100644 --- a/test/413-regalloc-regression/Android.bp +++ b/test/413-regalloc-regression/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-413-regalloc-regression-expected-stdout", ":art-run-test-413-regalloc-regression-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/414-static-fields/Android.bp b/test/414-static-fields/Android.bp index 7f105d443f..8ab19f793f 100644 --- a/test/414-static-fields/Android.bp +++ b/test/414-static-fields/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-414-static-fields-expected-stdout", ":art-run-test-414-static-fields-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/418-const-string/Android.bp b/test/418-const-string/Android.bp index 8a57f20fe9..70db7005ac 100644 --- a/test/418-const-string/Android.bp +++ b/test/418-const-string/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-418-const-string-expected-stdout", ":art-run-test-418-const-string-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/419-long-parameter/Android.bp b/test/419-long-parameter/Android.bp index 5e3c4176e7..cf1018cc5e 100644 --- a/test/419-long-parameter/Android.bp +++ b/test/419-long-parameter/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-419-long-parameter-expected-stdout", ":art-run-test-419-long-parameter-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/420-const-class/Android.bp b/test/420-const-class/Android.bp index 11cd5577b3..bffc12861a 100644 --- a/test/420-const-class/Android.bp +++ b/test/420-const-class/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-420-const-class-expected-stdout", ":art-run-test-420-const-class-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/421-exceptions/Android.bp b/test/421-exceptions/Android.bp index d1ee3419fc..e5a18957d9 100644 --- a/test/421-exceptions/Android.bp +++ b/test/421-exceptions/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-421-exceptions-expected-stdout", ":art-run-test-421-exceptions-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/421-large-frame/Android.bp b/test/421-large-frame/Android.bp index 68f12f8453..5d76f0f58c 100644 --- a/test/421-large-frame/Android.bp +++ b/test/421-large-frame/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-421-large-frame-expected-stdout", ":art-run-test-421-large-frame-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/422-instanceof/Android.bp b/test/422-instanceof/Android.bp index 983dbeea89..08c92f7d9d 100644 --- a/test/422-instanceof/Android.bp +++ b/test/422-instanceof/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-422-instanceof-expected-stdout", ":art-run-test-422-instanceof-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/422-type-conversion/Android.bp b/test/422-type-conversion/Android.bp index 737f06b8c8..7946cb1a53 100644 --- a/test/422-type-conversion/Android.bp +++ b/test/422-type-conversion/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-422-type-conversion-expected-stdout", ":art-run-test-422-type-conversion-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/423-invoke-interface/Android.bp b/test/423-invoke-interface/Android.bp index 49a131188a..b984f6c32a 100644 --- a/test/423-invoke-interface/Android.bp +++ b/test/423-invoke-interface/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-423-invoke-interface-expected-stdout", ":art-run-test-423-invoke-interface-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/424-checkcast/Android.bp b/test/424-checkcast/Android.bp index 11684c3839..4d8cfbd383 100644 --- a/test/424-checkcast/Android.bp +++ b/test/424-checkcast/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-424-checkcast-expected-stdout", ":art-run-test-424-checkcast-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/426-monitor/Android.bp b/test/426-monitor/Android.bp index 7bea5da06b..40b6b83d12 100644 --- a/test/426-monitor/Android.bp +++ b/test/426-monitor/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-426-monitor-expected-stdout", ":art-run-test-426-monitor-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/427-bitwise/Android.bp b/test/427-bitwise/Android.bp index 858aaf5d51..94c28cc4f7 100644 --- a/test/427-bitwise/Android.bp +++ b/test/427-bitwise/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-427-bitwise-expected-stdout", ":art-run-test-427-bitwise-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/427-bounds/Android.bp b/test/427-bounds/Android.bp index 606c186284..2afa2b0f28 100644 --- a/test/427-bounds/Android.bp +++ b/test/427-bounds/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-427-bounds-expected-stdout", ":art-run-test-427-bounds-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/429-ssa-builder/Android.bp b/test/429-ssa-builder/Android.bp index 4e7b2634d2..27b26f05c3 100644 --- a/test/429-ssa-builder/Android.bp +++ b/test/429-ssa-builder/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-429-ssa-builder-expected-stdout", ":art-run-test-429-ssa-builder-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/430-live-register-slow-path/Android.bp b/test/430-live-register-slow-path/Android.bp index 0295e466b2..8093987e39 100644 --- a/test/430-live-register-slow-path/Android.bp +++ b/test/430-live-register-slow-path/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-430-live-register-slow-path-expected-stdout", ":art-run-test-430-live-register-slow-path-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/433-gvn/Android.bp b/test/433-gvn/Android.bp index e4f6b9a5b4..7a4f2d4637 100644 --- a/test/433-gvn/Android.bp +++ b/test/433-gvn/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-433-gvn-expected-stdout", ":art-run-test-433-gvn-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/434-shifter-operand/Android.bp b/test/434-shifter-operand/Android.bp index 4309d8aba2..36124aaa42 100644 --- a/test/434-shifter-operand/Android.bp +++ b/test/434-shifter-operand/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-434-shifter-operand-expected-stdout", ":art-run-test-434-shifter-operand-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/435-try-finally-without-catch/Android.bp b/test/435-try-finally-without-catch/Android.bp index d8c0409bbf..83d8314026 100644 --- a/test/435-try-finally-without-catch/Android.bp +++ b/test/435-try-finally-without-catch/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-435-try-finally-without-catch-expected-stdout", ":art-run-test-435-try-finally-without-catch-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/436-rem-float/Android.bp b/test/436-rem-float/Android.bp index 526f22f776..dc3cdc4b45 100644 --- a/test/436-rem-float/Android.bp +++ b/test/436-rem-float/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-436-rem-float-expected-stdout", ":art-run-test-436-rem-float-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/436-shift-constant/Android.bp b/test/436-shift-constant/Android.bp index 107e392799..97a2e1950f 100644 --- a/test/436-shift-constant/Android.bp +++ b/test/436-shift-constant/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-436-shift-constant-expected-stdout", ":art-run-test-436-shift-constant-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/437-inline/Android.bp b/test/437-inline/Android.bp index 7596d03585..e5688ef446 100644 --- a/test/437-inline/Android.bp +++ b/test/437-inline/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-437-inline-expected-stdout", ":art-run-test-437-inline-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/438-volatile/Android.bp b/test/438-volatile/Android.bp index adc4a80771..64879883cb 100644 --- a/test/438-volatile/Android.bp +++ b/test/438-volatile/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-438-volatile-expected-stdout", ":art-run-test-438-volatile-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/439-npe/Android.bp b/test/439-npe/Android.bp index 527b6cfc16..d47a8b779f 100644 --- a/test/439-npe/Android.bp +++ b/test/439-npe/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-439-npe-expected-stdout", ":art-run-test-439-npe-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/439-swap-double/Android.bp b/test/439-swap-double/Android.bp index f175231d28..8328aa366a 100644 --- a/test/439-swap-double/Android.bp +++ b/test/439-swap-double/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-439-swap-double-expected-stdout", ":art-run-test-439-swap-double-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/440-stmp/Android.bp b/test/440-stmp/Android.bp index 5ace2fc9aa..2534da6fe9 100644 --- a/test/440-stmp/Android.bp +++ b/test/440-stmp/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-440-stmp-expected-stdout", ":art-run-test-440-stmp-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/441-checker-inliner/Android.bp b/test/441-checker-inliner/Android.bp index f4eef68566..8c4a5de902 100644 --- a/test/441-checker-inliner/Android.bp +++ b/test/441-checker-inliner/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-441-checker-inliner-expected-stdout", ":art-run-test-441-checker-inliner-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/443-not-bool-inline/Android.bp b/test/443-not-bool-inline/Android.bp index 706c992220..bd20a9b28b 100644 --- a/test/443-not-bool-inline/Android.bp +++ b/test/443-not-bool-inline/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-443-not-bool-inline-expected-stdout", ":art-run-test-443-not-bool-inline-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/444-checker-nce/Android.bp b/test/444-checker-nce/Android.bp index de79050517..6cbe63e438 100644 --- a/test/444-checker-nce/Android.bp +++ b/test/444-checker-nce/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-444-checker-nce-expected-stdout", ":art-run-test-444-checker-nce-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/445-checker-licm/Android.bp b/test/445-checker-licm/Android.bp index 0932efb4bc..c38c9522b9 100644 --- a/test/445-checker-licm/Android.bp +++ b/test/445-checker-licm/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-445-checker-licm-expected-stdout", ":art-run-test-445-checker-licm-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/446-checker-inliner2/Android.bp b/test/446-checker-inliner2/Android.bp index 6f2e554274..adaabfaa39 100644 --- a/test/446-checker-inliner2/Android.bp +++ b/test/446-checker-inliner2/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-446-checker-inliner2-expected-stdout", ":art-run-test-446-checker-inliner2-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/447-checker-inliner3/Android.bp b/test/447-checker-inliner3/Android.bp index ee3b41b071..b2b7cf24df 100644 --- a/test/447-checker-inliner3/Android.bp +++ b/test/447-checker-inliner3/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-447-checker-inliner3-expected-stdout", ":art-run-test-447-checker-inliner3-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/449-checker-bce-rem/Android.bp b/test/449-checker-bce-rem/Android.bp index d6f10ee4e7..100dd689a8 100644 --- a/test/449-checker-bce-rem/Android.bp +++ b/test/449-checker-bce-rem/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-449-checker-bce-rem-expected-stdout", ":art-run-test-449-checker-bce-rem-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/450-checker-types/Android.bp b/test/450-checker-types/Android.bp index bf45226669..b20e6d1a98 100644 --- a/test/450-checker-types/Android.bp +++ b/test/450-checker-types/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-450-checker-types-expected-stdout", ":art-run-test-450-checker-types-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/451-regression-add-float/Android.bp b/test/451-regression-add-float/Android.bp index 26d7d0af40..a343561db8 100644 --- a/test/451-regression-add-float/Android.bp +++ b/test/451-regression-add-float/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-451-regression-add-float-expected-stdout", ":art-run-test-451-regression-add-float-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/451-spill-splot/Android.bp b/test/451-spill-splot/Android.bp index d7736738c5..2a21df7c87 100644 --- a/test/451-spill-splot/Android.bp +++ b/test/451-spill-splot/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-451-spill-splot-expected-stdout", ":art-run-test-451-spill-splot-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/455-checker-gvn/Android.bp b/test/455-checker-gvn/Android.bp index 2e366167c0..7c525e0213 100644 --- a/test/455-checker-gvn/Android.bp +++ b/test/455-checker-gvn/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-455-checker-gvn-expected-stdout", ":art-run-test-455-checker-gvn-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/456-baseline-array-set/Android.bp b/test/456-baseline-array-set/Android.bp index 28d83d010d..55246b4fc0 100644 --- a/test/456-baseline-array-set/Android.bp +++ b/test/456-baseline-array-set/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-456-baseline-array-set-expected-stdout", ":art-run-test-456-baseline-array-set-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/458-checker-riscv64-shift-add/Android.bp b/test/458-checker-riscv64-shift-add/Android.bp index aafc079d24..7ba43b16e3 100644 --- a/test/458-checker-riscv64-shift-add/Android.bp +++ b/test/458-checker-riscv64-shift-add/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-458-checker-riscv64-shift-add-expected-stdout", ":art-run-test-458-checker-riscv64-shift-add-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/458-long-to-fpu/Android.bp b/test/458-long-to-fpu/Android.bp index efd612ea11..ad493959d1 100644 --- a/test/458-long-to-fpu/Android.bp +++ b/test/458-long-to-fpu/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-458-long-to-fpu-expected-stdout", ":art-run-test-458-long-to-fpu-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/464-checker-inline-sharpen-calls/Android.bp b/test/464-checker-inline-sharpen-calls/Android.bp index aeff431925..2ed61f1261 100644 --- a/test/464-checker-inline-sharpen-calls/Android.bp +++ b/test/464-checker-inline-sharpen-calls/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-464-checker-inline-sharpen-calls-expected-stdout", ":art-run-test-464-checker-inline-sharpen-calls-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/465-checker-clinit-gvn/Android.bp b/test/465-checker-clinit-gvn/Android.bp index eef374c999..3e3ad0678a 100644 --- a/test/465-checker-clinit-gvn/Android.bp +++ b/test/465-checker-clinit-gvn/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-465-checker-clinit-gvn-expected-stdout", ":art-run-test-465-checker-clinit-gvn-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/469-condition-materialization/Android.bp b/test/469-condition-materialization/Android.bp index c9861412ac..1e46150833 100644 --- a/test/469-condition-materialization/Android.bp +++ b/test/469-condition-materialization/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-469-condition-materialization-expected-stdout", ":art-run-test-469-condition-materialization-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/470-huge-method/Android.bp b/test/470-huge-method/Android.bp index e5cabea43b..fd7d263eff 100644 --- a/test/470-huge-method/Android.bp +++ b/test/470-huge-method/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-470-huge-method-expected-stdout", ":art-run-test-470-huge-method-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/471-deopt-environment/Android.bp b/test/471-deopt-environment/Android.bp index d0eaca3523..139558a402 100644 --- a/test/471-deopt-environment/Android.bp +++ b/test/471-deopt-environment/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-471-deopt-environment-expected-stdout", ":art-run-test-471-deopt-environment-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/472-type-propagation/Android.bp b/test/472-type-propagation/Android.bp index 247e222439..bc7f054efb 100644 --- a/test/472-type-propagation/Android.bp +++ b/test/472-type-propagation/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-472-type-propagation-expected-stdout", ":art-run-test-472-type-propagation-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/473-checker-inliner-constants/Android.bp b/test/473-checker-inliner-constants/Android.bp index 4768c70d7e..d2b62938a4 100644 --- a/test/473-checker-inliner-constants/Android.bp +++ b/test/473-checker-inliner-constants/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-473-checker-inliner-constants-expected-stdout", ":art-run-test-473-checker-inliner-constants-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/473-remove-dead-block/Android.bp b/test/473-remove-dead-block/Android.bp index ea4145357f..2b5c678dd6 100644 --- a/test/473-remove-dead-block/Android.bp +++ b/test/473-remove-dead-block/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-473-remove-dead-block-expected-stdout", ":art-run-test-473-remove-dead-block-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/474-checker-boolean-input/Android.bp b/test/474-checker-boolean-input/Android.bp index 505d4c2b67..6ca6acf72d 100644 --- a/test/474-checker-boolean-input/Android.bp +++ b/test/474-checker-boolean-input/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-474-checker-boolean-input-expected-stdout", ":art-run-test-474-checker-boolean-input-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/474-fp-sub-neg/Android.bp b/test/474-fp-sub-neg/Android.bp index 2d61503be5..08e9ba2839 100644 --- a/test/474-fp-sub-neg/Android.bp +++ b/test/474-fp-sub-neg/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-474-fp-sub-neg-expected-stdout", ":art-run-test-474-fp-sub-neg-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/475-simplify-mul-zero/Android.bp b/test/475-simplify-mul-zero/Android.bp index 0e9dfd583d..a81b41b4e9 100644 --- a/test/475-simplify-mul-zero/Android.bp +++ b/test/475-simplify-mul-zero/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-475-simplify-mul-zero-expected-stdout", ":art-run-test-475-simplify-mul-zero-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/476-checker-ctor-fence-redun-elim/Android.bp b/test/476-checker-ctor-fence-redun-elim/Android.bp index dfbbb7a1e5..1a7d68a92b 100644 --- a/test/476-checker-ctor-fence-redun-elim/Android.bp +++ b/test/476-checker-ctor-fence-redun-elim/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-476-checker-ctor-fence-redun-elim-expected-stdout", ":art-run-test-476-checker-ctor-fence-redun-elim-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/476-checker-ctor-memory-barrier/Android.bp b/test/476-checker-ctor-memory-barrier/Android.bp index ec92628600..60f1eaa539 100644 --- a/test/476-checker-ctor-memory-barrier/Android.bp +++ b/test/476-checker-ctor-memory-barrier/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-476-checker-ctor-memory-barrier-expected-stdout", ":art-run-test-476-checker-ctor-memory-barrier-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/476-clinit-inline-static-invoke/Android.bp b/test/476-clinit-inline-static-invoke/Android.bp index c1fc1dcd30..dc850817c9 100644 --- a/test/476-clinit-inline-static-invoke/Android.bp +++ b/test/476-clinit-inline-static-invoke/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-476-clinit-inline-static-invoke-expected-stdout", ":art-run-test-476-clinit-inline-static-invoke-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/477-checker-bound-type/Android.bp b/test/477-checker-bound-type/Android.bp index 72bf2a692e..a16526db22 100644 --- a/test/477-checker-bound-type/Android.bp +++ b/test/477-checker-bound-type/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-477-checker-bound-type-expected-stdout", ":art-run-test-477-checker-bound-type-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/477-long-2-float-convers-precision/Android.bp b/test/477-long-2-float-convers-precision/Android.bp index baaf623b90..6454b0146d 100644 --- a/test/477-long-2-float-convers-precision/Android.bp +++ b/test/477-long-2-float-convers-precision/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-477-long-2-float-convers-precision-expected-stdout", ":art-run-test-477-long-2-float-convers-precision-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/478-checker-clinit-check-pruning/Android.bp b/test/478-checker-clinit-check-pruning/Android.bp index 78a41b9f75..3cc9ab1768 100644 --- a/test/478-checker-clinit-check-pruning/Android.bp +++ b/test/478-checker-clinit-check-pruning/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-478-checker-clinit-check-pruning-expected-stdout", ":art-run-test-478-checker-clinit-check-pruning-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/478-checker-inline-noreturn/Android.bp b/test/478-checker-inline-noreturn/Android.bp index a766f88c83..2f2c293353 100644 --- a/test/478-checker-inline-noreturn/Android.bp +++ b/test/478-checker-inline-noreturn/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-478-checker-inline-noreturn-expected-stdout", ":art-run-test-478-checker-inline-noreturn-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/478-checker-inliner-nested-loop/Android.bp b/test/478-checker-inliner-nested-loop/Android.bp index afdcc163b9..12116b1d05 100644 --- a/test/478-checker-inliner-nested-loop/Android.bp +++ b/test/478-checker-inliner-nested-loop/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-478-checker-inliner-nested-loop-expected-stdout", ":art-run-test-478-checker-inliner-nested-loop-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/479-regression-implicit-null-check/Android.bp b/test/479-regression-implicit-null-check/Android.bp index 25d8907720..0575f4ae87 100644 --- a/test/479-regression-implicit-null-check/Android.bp +++ b/test/479-regression-implicit-null-check/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-479-regression-implicit-null-check-expected-stdout", ":art-run-test-479-regression-implicit-null-check-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/480-checker-dead-blocks/Android.bp b/test/480-checker-dead-blocks/Android.bp index 706a723ac2..5b04b42cfe 100644 --- a/test/480-checker-dead-blocks/Android.bp +++ b/test/480-checker-dead-blocks/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-480-checker-dead-blocks-expected-stdout", ":art-run-test-480-checker-dead-blocks-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/481-regression-phi-cond/Android.bp b/test/481-regression-phi-cond/Android.bp index cf9e14a609..72ecb7316e 100644 --- a/test/481-regression-phi-cond/Android.bp +++ b/test/481-regression-phi-cond/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-481-regression-phi-cond-expected-stdout", ":art-run-test-481-regression-phi-cond-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/482-checker-loop-back-edge-use/Android.bp b/test/482-checker-loop-back-edge-use/Android.bp index 5c911bdd9c..ad6e0a08e9 100644 --- a/test/482-checker-loop-back-edge-use/Android.bp +++ b/test/482-checker-loop-back-edge-use/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-482-checker-loop-back-edge-use-expected-stdout", ":art-run-test-482-checker-loop-back-edge-use-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/483-dce-block/Android.bp b/test/483-dce-block/Android.bp index 52ec2af780..c7f507793b 100644 --- a/test/483-dce-block/Android.bp +++ b/test/483-dce-block/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-483-dce-block-expected-stdout", ":art-run-test-483-dce-block-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/485-checker-dce-switch/Android.bp b/test/485-checker-dce-switch/Android.bp index ea5646130a..2ea03649f9 100644 --- a/test/485-checker-dce-switch/Android.bp +++ b/test/485-checker-dce-switch/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-485-checker-dce-switch-expected-stdout", ":art-run-test-485-checker-dce-switch-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/486-checker-must-do-null-check/Android.bp b/test/486-checker-must-do-null-check/Android.bp index 5c07c39ec8..b99415bf4b 100644 --- a/test/486-checker-must-do-null-check/Android.bp +++ b/test/486-checker-must-do-null-check/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-486-checker-must-do-null-check-expected-stdout", ":art-run-test-486-checker-must-do-null-check-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/487-checker-inline-calls/Android.bp b/test/487-checker-inline-calls/Android.bp index 42d64f4687..390ceb5db6 100644 --- a/test/487-checker-inline-calls/Android.bp +++ b/test/487-checker-inline-calls/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-487-checker-inline-calls-expected-stdout", ":art-run-test-487-checker-inline-calls-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/488-checker-inline-recursive-calls/Android.bp b/test/488-checker-inline-recursive-calls/Android.bp index 9a171adead..8de1568796 100644 --- a/test/488-checker-inline-recursive-calls/Android.bp +++ b/test/488-checker-inline-recursive-calls/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-488-checker-inline-recursive-calls-expected-stdout", ":art-run-test-488-checker-inline-recursive-calls-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/489-current-method-regression/Android.bp b/test/489-current-method-regression/Android.bp index 27aae46adf..8af9eb716c 100644 --- a/test/489-current-method-regression/Android.bp +++ b/test/489-current-method-regression/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-489-current-method-regression-expected-stdout", ":art-run-test-489-current-method-regression-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/490-checker-inline/Android.bp b/test/490-checker-inline/Android.bp index 70ca37f305..4bb3265dc0 100644 --- a/test/490-checker-inline/Android.bp +++ b/test/490-checker-inline/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-490-checker-inline-expected-stdout", ":art-run-test-490-checker-inline-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/491-current-method/Android.bp b/test/491-current-method/Android.bp index af93f4bb70..9617440c69 100644 --- a/test/491-current-method/Android.bp +++ b/test/491-current-method/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-491-current-method-expected-stdout", ":art-run-test-491-current-method-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/492-checker-inline-invoke-interface/Android.bp b/test/492-checker-inline-invoke-interface/Android.bp index 06eecee8f9..b9c5ba545e 100644 --- a/test/492-checker-inline-invoke-interface/Android.bp +++ b/test/492-checker-inline-invoke-interface/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-492-checker-inline-invoke-interface-expected-stdout", ":art-run-test-492-checker-inline-invoke-interface-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/493-checker-inline-invoke-interface/Android.bp b/test/493-checker-inline-invoke-interface/Android.bp index 4b981bf79a..a86a3b5d72 100644 --- a/test/493-checker-inline-invoke-interface/Android.bp +++ b/test/493-checker-inline-invoke-interface/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-493-checker-inline-invoke-interface-expected-stdout", ":art-run-test-493-checker-inline-invoke-interface-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/494-checker-instanceof-tests/Android.bp b/test/494-checker-instanceof-tests/Android.bp index cd9c4c713e..99da9df524 100644 --- a/test/494-checker-instanceof-tests/Android.bp +++ b/test/494-checker-instanceof-tests/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-494-checker-instanceof-tests-expected-stdout", ":art-run-test-494-checker-instanceof-tests-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/495-checker-checkcast-tests/Android.bp b/test/495-checker-checkcast-tests/Android.bp index 019a6fdeb1..2a4614c5dd 100644 --- a/test/495-checker-checkcast-tests/Android.bp +++ b/test/495-checker-checkcast-tests/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-495-checker-checkcast-tests-expected-stdout", ":art-run-test-495-checker-checkcast-tests-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/496-checker-inlining-class-loader/Android.bp b/test/496-checker-inlining-class-loader/Android.bp index 17e838da0d..ff1d3bb720 100644 --- a/test/496-checker-inlining-class-loader/Android.bp +++ b/test/496-checker-inlining-class-loader/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-496-checker-inlining-class-loader-expected-stdout", ":art-run-test-496-checker-inlining-class-loader-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/499-bce-phi-array-length/Android.bp b/test/499-bce-phi-array-length/Android.bp index 1af6673f41..44505ab2e9 100644 --- a/test/499-bce-phi-array-length/Android.bp +++ b/test/499-bce-phi-array-length/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-499-bce-phi-array-length-expected-stdout", ":art-run-test-499-bce-phi-array-length-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/500-instanceof/Android.bp b/test/500-instanceof/Android.bp index fdb48a7eba..d99bf044db 100644 --- a/test/500-instanceof/Android.bp +++ b/test/500-instanceof/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-500-instanceof-expected-stdout", ":art-run-test-500-instanceof-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/505-simplifier-type-propagation/Android.bp b/test/505-simplifier-type-propagation/Android.bp index 4e8ab74cb8..9cdc46f9f3 100644 --- a/test/505-simplifier-type-propagation/Android.bp +++ b/test/505-simplifier-type-propagation/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-505-simplifier-type-propagation-expected-stdout", ":art-run-test-505-simplifier-type-propagation-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/507-boolean-test/Android.bp b/test/507-boolean-test/Android.bp index b1066bd1af..0cbab41549 100644 --- a/test/507-boolean-test/Android.bp +++ b/test/507-boolean-test/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-507-boolean-test-expected-stdout", ":art-run-test-507-boolean-test-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/507-referrer/Android.bp b/test/507-referrer/Android.bp index 2062922e83..548a55da30 100644 --- a/test/507-referrer/Android.bp +++ b/test/507-referrer/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-507-referrer-expected-stdout", ":art-run-test-507-referrer-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/508-checker-disassembly/Android.bp b/test/508-checker-disassembly/Android.bp index a657c16f80..37a153f01b 100644 --- a/test/508-checker-disassembly/Android.bp +++ b/test/508-checker-disassembly/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-508-checker-disassembly-expected-stdout", ":art-run-test-508-checker-disassembly-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/508-referrer-method/Android.bp b/test/508-referrer-method/Android.bp index 0964765ea5..54dc6e159a 100644 --- a/test/508-referrer-method/Android.bp +++ b/test/508-referrer-method/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-508-referrer-method-expected-stdout", ":art-run-test-508-referrer-method-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/513-array-deopt/Android.bp b/test/513-array-deopt/Android.bp index 1ede9a831a..fea15da431 100644 --- a/test/513-array-deopt/Android.bp +++ b/test/513-array-deopt/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-513-array-deopt-expected-stdout", ":art-run-test-513-array-deopt-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/514-shifts/Android.bp b/test/514-shifts/Android.bp index e5bd604c75..b0c4f565ac 100644 --- a/test/514-shifts/Android.bp +++ b/test/514-shifts/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-514-shifts-expected-stdout", ":art-run-test-514-shifts-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/519-bound-load-class/Android.bp b/test/519-bound-load-class/Android.bp index 5b0cbedd96..49798ab3b2 100644 --- a/test/519-bound-load-class/Android.bp +++ b/test/519-bound-load-class/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-519-bound-load-class-expected-stdout", ":art-run-test-519-bound-load-class-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/521-checker-array-set-null/Android.bp b/test/521-checker-array-set-null/Android.bp index 1199d81124..265db4c16f 100644 --- a/test/521-checker-array-set-null/Android.bp +++ b/test/521-checker-array-set-null/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-521-checker-array-set-null-expected-stdout", ":art-run-test-521-checker-array-set-null-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/521-regression-integer-field-set/Android.bp b/test/521-regression-integer-field-set/Android.bp index b90141e83c..0205ff2c0a 100644 --- a/test/521-regression-integer-field-set/Android.bp +++ b/test/521-regression-integer-field-set/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-521-regression-integer-field-set-expected-stdout", ":art-run-test-521-regression-integer-field-set-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/524-boolean-simplifier-regression/Android.bp b/test/524-boolean-simplifier-regression/Android.bp index be075e8999..8f73d9604a 100644 --- a/test/524-boolean-simplifier-regression/Android.bp +++ b/test/524-boolean-simplifier-regression/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-524-boolean-simplifier-regression-expected-stdout", ":art-run-test-524-boolean-simplifier-regression-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/525-checker-arrays-fields1/Android.bp b/test/525-checker-arrays-fields1/Android.bp index 8cfe2b0811..7806624a0e 100644 --- a/test/525-checker-arrays-fields1/Android.bp +++ b/test/525-checker-arrays-fields1/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-525-checker-arrays-fields1-expected-stdout", ":art-run-test-525-checker-arrays-fields1-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/525-checker-arrays-fields2/Android.bp b/test/525-checker-arrays-fields2/Android.bp index c6e165be54..9808f7333a 100644 --- a/test/525-checker-arrays-fields2/Android.bp +++ b/test/525-checker-arrays-fields2/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-525-checker-arrays-fields2-expected-stdout", ":art-run-test-525-checker-arrays-fields2-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/526-checker-caller-callee-regs/Android.bp b/test/526-checker-caller-callee-regs/Android.bp index c84b09cad5..578215f11e 100644 --- a/test/526-checker-caller-callee-regs/Android.bp +++ b/test/526-checker-caller-callee-regs/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-526-checker-caller-callee-regs-expected-stdout", ":art-run-test-526-checker-caller-callee-regs-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/526-long-regalloc/Android.bp b/test/526-long-regalloc/Android.bp index 34e4a2da17..1bfa389dad 100644 --- a/test/526-long-regalloc/Android.bp +++ b/test/526-long-regalloc/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-526-long-regalloc-expected-stdout", ":art-run-test-526-long-regalloc-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/527-checker-array-access-simd/Android.bp b/test/527-checker-array-access-simd/Android.bp index 96bb43a401..8109f339f2 100644 --- a/test/527-checker-array-access-simd/Android.bp +++ b/test/527-checker-array-access-simd/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-527-checker-array-access-simd-expected-stdout", ":art-run-test-527-checker-array-access-simd-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/527-checker-array-access-split/Android.bp b/test/527-checker-array-access-split/Android.bp index 849530a925..2e71ca8aed 100644 --- a/test/527-checker-array-access-split/Android.bp +++ b/test/527-checker-array-access-split/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-527-checker-array-access-split-expected-stdout", ":art-run-test-527-checker-array-access-split-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/528-long-hint/Android.bp b/test/528-long-hint/Android.bp index b3ddd560a4..f853956aa6 100644 --- a/test/528-long-hint/Android.bp +++ b/test/528-long-hint/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-528-long-hint-expected-stdout", ":art-run-test-528-long-hint-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/529-long-split/Android.bp b/test/529-long-split/Android.bp index d607272202..1870afc4a1 100644 --- a/test/529-long-split/Android.bp +++ b/test/529-long-split/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-529-long-split-expected-stdout", ":art-run-test-529-long-split-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/530-checker-loops-try-catch/Android.bp b/test/530-checker-loops-try-catch/Android.bp index b7b41275b3..91df9b0816 100644 --- a/test/530-checker-loops-try-catch/Android.bp +++ b/test/530-checker-loops-try-catch/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-530-checker-loops-try-catch-expected-stdout", ":art-run-test-530-checker-loops-try-catch-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/530-checker-loops1/Android.bp b/test/530-checker-loops1/Android.bp index 6bbb5af870..f1a541fb9b 100644 --- a/test/530-checker-loops1/Android.bp +++ b/test/530-checker-loops1/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-530-checker-loops1-expected-stdout", ":art-run-test-530-checker-loops1-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/530-checker-loops2/Android.bp b/test/530-checker-loops2/Android.bp index d196923715..0ff1af43e9 100644 --- a/test/530-checker-loops2/Android.bp +++ b/test/530-checker-loops2/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-530-checker-loops2-expected-stdout", ":art-run-test-530-checker-loops2-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/530-checker-loops3/Android.bp b/test/530-checker-loops3/Android.bp index ef2f738daa..9c6454eb01 100644 --- a/test/530-checker-loops3/Android.bp +++ b/test/530-checker-loops3/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-530-checker-loops3-expected-stdout", ":art-run-test-530-checker-loops3-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/530-checker-loops4/Android.bp b/test/530-checker-loops4/Android.bp index 54014669b2..fae666ce78 100644 --- a/test/530-checker-loops4/Android.bp +++ b/test/530-checker-loops4/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-530-checker-loops4-expected-stdout", ":art-run-test-530-checker-loops4-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/530-checker-loops5/Android.bp b/test/530-checker-loops5/Android.bp index 658e985645..6ac9b7e6f5 100644 --- a/test/530-checker-loops5/Android.bp +++ b/test/530-checker-loops5/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-530-checker-loops5-expected-stdout", ":art-run-test-530-checker-loops5-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/530-checker-lse-ctor-fences/Android.bp b/test/530-checker-lse-ctor-fences/Android.bp index c42ed9681d..019aa5f95f 100644 --- a/test/530-checker-lse-ctor-fences/Android.bp +++ b/test/530-checker-lse-ctor-fences/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-530-checker-lse-ctor-fences-expected-stdout", ":art-run-test-530-checker-lse-ctor-fences-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/530-checker-lse-simd/Android.bp b/test/530-checker-lse-simd/Android.bp index cf08d41d56..50e6e85cc8 100644 --- a/test/530-checker-lse-simd/Android.bp +++ b/test/530-checker-lse-simd/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-530-checker-lse-simd-expected-stdout", ":art-run-test-530-checker-lse-simd-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/530-checker-lse-try-catch/Android.bp b/test/530-checker-lse-try-catch/Android.bp index 6a58ea7327..71ef28ea88 100644 --- a/test/530-checker-lse-try-catch/Android.bp +++ b/test/530-checker-lse-try-catch/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-530-checker-lse-try-catch-expected-stdout", ":art-run-test-530-checker-lse-try-catch-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/530-checker-lse/Android.bp b/test/530-checker-lse/Android.bp index f53de37a1c..73b46d308f 100644 --- a/test/530-checker-lse/Android.bp +++ b/test/530-checker-lse/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-530-checker-lse-expected-stdout", ":art-run-test-530-checker-lse-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/530-instanceof-checkcast/Android.bp b/test/530-instanceof-checkcast/Android.bp index 3b782c42e2..488dd7bc81 100644 --- a/test/530-instanceof-checkcast/Android.bp +++ b/test/530-instanceof-checkcast/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-530-instanceof-checkcast-expected-stdout", ":art-run-test-530-instanceof-checkcast-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/532-checker-nonnull-arrayset/Android.bp b/test/532-checker-nonnull-arrayset/Android.bp index 5ada4c537a..b75d63534c 100644 --- a/test/532-checker-nonnull-arrayset/Android.bp +++ b/test/532-checker-nonnull-arrayset/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-532-checker-nonnull-arrayset-expected-stdout", ":art-run-test-532-checker-nonnull-arrayset-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/534-checker-bce-deoptimization/Android.bp b/test/534-checker-bce-deoptimization/Android.bp index 7fcfce0e6b..0ff98e5ed1 100644 --- a/test/534-checker-bce-deoptimization/Android.bp +++ b/test/534-checker-bce-deoptimization/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-534-checker-bce-deoptimization-expected-stdout", ":art-run-test-534-checker-bce-deoptimization-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/535-deopt-and-inlining/Android.bp b/test/535-deopt-and-inlining/Android.bp index 2429c1ed2b..664e15915e 100644 --- a/test/535-deopt-and-inlining/Android.bp +++ b/test/535-deopt-and-inlining/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-535-deopt-and-inlining-expected-stdout", ":art-run-test-535-deopt-and-inlining-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/536-checker-intrinsic-optimization/Android.bp b/test/536-checker-intrinsic-optimization/Android.bp index b9832af09d..2a2a0e5aed 100644 --- a/test/536-checker-intrinsic-optimization/Android.bp +++ b/test/536-checker-intrinsic-optimization/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-536-checker-intrinsic-optimization-expected-stdout", ":art-run-test-536-checker-intrinsic-optimization-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/536-checker-needs-access-check/Android.bp b/test/536-checker-needs-access-check/Android.bp index 2f2b650646..bd925e2c22 100644 --- a/test/536-checker-needs-access-check/Android.bp +++ b/test/536-checker-needs-access-check/Android.bp @@ -31,6 +31,9 @@ java_test { ":art-run-test-536-checker-needs-access-check-expected-stdout", ":art-run-test-536-checker-needs-access-check-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/537-checker-arraycopy/Android.bp b/test/537-checker-arraycopy/Android.bp index 83b7bd313b..a7e4ab5a24 100644 --- a/test/537-checker-arraycopy/Android.bp +++ b/test/537-checker-arraycopy/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-537-checker-arraycopy-expected-stdout", ":art-run-test-537-checker-arraycopy-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/537-checker-inline-and-unverified/Android.bp b/test/537-checker-inline-and-unverified/Android.bp index cca7486525..92c42b24a4 100644 --- a/test/537-checker-inline-and-unverified/Android.bp +++ b/test/537-checker-inline-and-unverified/Android.bp @@ -31,6 +31,9 @@ java_test { ":art-run-test-537-checker-inline-and-unverified-expected-stdout", ":art-run-test-537-checker-inline-and-unverified-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/537-checker-jump-over-jump/Android.bp b/test/537-checker-jump-over-jump/Android.bp index e53a69fccd..ca717643ef 100644 --- a/test/537-checker-jump-over-jump/Android.bp +++ b/test/537-checker-jump-over-jump/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-537-checker-jump-over-jump-expected-stdout", ":art-run-test-537-checker-jump-over-jump-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/538-checker-embed-constants/Android.bp b/test/538-checker-embed-constants/Android.bp index 5fa5a74d28..140cd1b7c3 100644 --- a/test/538-checker-embed-constants/Android.bp +++ b/test/538-checker-embed-constants/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-538-checker-embed-constants-expected-stdout", ":art-run-test-538-checker-embed-constants-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/540-checker-rtp-bug/Android.bp b/test/540-checker-rtp-bug/Android.bp index 413e55da34..507b2269bf 100644 --- a/test/540-checker-rtp-bug/Android.bp +++ b/test/540-checker-rtp-bug/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-540-checker-rtp-bug-expected-stdout", ":art-run-test-540-checker-rtp-bug-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/542-bitfield-rotates/Android.bp b/test/542-bitfield-rotates/Android.bp index 21f6999c66..61884c9f6a 100644 --- a/test/542-bitfield-rotates/Android.bp +++ b/test/542-bitfield-rotates/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-542-bitfield-rotates-expected-stdout", ":art-run-test-542-bitfield-rotates-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/542-inline-trycatch/Android.bp b/test/542-inline-trycatch/Android.bp index 41ca0492a3..52ab35fcf9 100644 --- a/test/542-inline-trycatch/Android.bp +++ b/test/542-inline-trycatch/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-542-inline-trycatch-expected-stdout", ":art-run-test-542-inline-trycatch-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/542-unresolved-access-check/Android.bp b/test/542-unresolved-access-check/Android.bp index cb77b500e2..f2c499b44c 100644 --- a/test/542-unresolved-access-check/Android.bp +++ b/test/542-unresolved-access-check/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-542-unresolved-access-check-expected-stdout", ":art-run-test-542-unresolved-access-check-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/545-tracing-and-jit/Android.bp b/test/545-tracing-and-jit/Android.bp index 2615572973..22c8c30fc9 100644 --- a/test/545-tracing-and-jit/Android.bp +++ b/test/545-tracing-and-jit/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-545-tracing-and-jit-expected-stdout", ":art-run-test-545-tracing-and-jit-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/548-checker-inlining-and-dce/Android.bp b/test/548-checker-inlining-and-dce/Android.bp index eb4874a648..43e1fbc157 100644 --- a/test/548-checker-inlining-and-dce/Android.bp +++ b/test/548-checker-inlining-and-dce/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-548-checker-inlining-and-dce-expected-stdout", ":art-run-test-548-checker-inlining-and-dce-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/549-checker-types-merge/Android.bp b/test/549-checker-types-merge/Android.bp index 6899fbc8c3..95a9192b71 100644 --- a/test/549-checker-types-merge/Android.bp +++ b/test/549-checker-types-merge/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-549-checker-types-merge-expected-stdout", ":art-run-test-549-checker-types-merge-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/550-checker-multiply-accumulate/Android.bp b/test/550-checker-multiply-accumulate/Android.bp index 12ad79b38d..1f5f4a0db1 100644 --- a/test/550-checker-multiply-accumulate/Android.bp +++ b/test/550-checker-multiply-accumulate/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-550-checker-multiply-accumulate-expected-stdout", ":art-run-test-550-checker-multiply-accumulate-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/550-new-instance-clinit/Android.bp b/test/550-new-instance-clinit/Android.bp index 458aa581a7..b954739743 100644 --- a/test/550-new-instance-clinit/Android.bp +++ b/test/550-new-instance-clinit/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-550-new-instance-clinit-expected-stdout", ":art-run-test-550-new-instance-clinit-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/551-checker-clinit/Android.bp b/test/551-checker-clinit/Android.bp index 8004adecd1..b53b189ef4 100644 --- a/test/551-checker-clinit/Android.bp +++ b/test/551-checker-clinit/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-551-checker-clinit-expected-stdout", ":art-run-test-551-checker-clinit-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/551-checker-shifter-operand/Android.bp b/test/551-checker-shifter-operand/Android.bp index e28af78845..bd55536b2c 100644 --- a/test/551-checker-shifter-operand/Android.bp +++ b/test/551-checker-shifter-operand/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-551-checker-shifter-operand-expected-stdout", ":art-run-test-551-checker-shifter-operand-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/551-implicit-null-checks/Android.bp b/test/551-implicit-null-checks/Android.bp index a29f36d3a2..47688be486 100644 --- a/test/551-implicit-null-checks/Android.bp +++ b/test/551-implicit-null-checks/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-551-implicit-null-checks-expected-stdout", ":art-run-test-551-implicit-null-checks-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/552-checker-x86-avx2-bit-manipulation/Android.bp b/test/552-checker-x86-avx2-bit-manipulation/Android.bp index 505b631f02..09f399ca1f 100644 --- a/test/552-checker-x86-avx2-bit-manipulation/Android.bp +++ b/test/552-checker-x86-avx2-bit-manipulation/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-552-checker-x86-avx2-bit-manipulation-expected-stdout", ":art-run-test-552-checker-x86-avx2-bit-manipulation-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/554-checker-rtp-checkcast/Android.bp b/test/554-checker-rtp-checkcast/Android.bp index 7c4bf6c8c7..94f1399eed 100644 --- a/test/554-checker-rtp-checkcast/Android.bp +++ b/test/554-checker-rtp-checkcast/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-554-checker-rtp-checkcast-expected-stdout", ":art-run-test-554-checker-rtp-checkcast-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/557-checker-instruct-simplifier-ror/Android.bp b/test/557-checker-instruct-simplifier-ror/Android.bp index a424b8ab56..3a7e067bd6 100644 --- a/test/557-checker-instruct-simplifier-ror/Android.bp +++ b/test/557-checker-instruct-simplifier-ror/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-557-checker-instruct-simplifier-ror-expected-stdout", ":art-run-test-557-checker-instruct-simplifier-ror-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/558-switch/Android.bp b/test/558-switch/Android.bp index 7c7ffddab9..01f5c8c460 100644 --- a/test/558-switch/Android.bp +++ b/test/558-switch/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-558-switch-expected-stdout", ":art-run-test-558-switch-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/559-bce-ssa/Android.bp b/test/559-bce-ssa/Android.bp index 025c7febe5..84d2158f65 100644 --- a/test/559-bce-ssa/Android.bp +++ b/test/559-bce-ssa/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-559-bce-ssa-expected-stdout", ":art-run-test-559-bce-ssa-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/559-checker-rtp-ifnotnull/Android.bp b/test/559-checker-rtp-ifnotnull/Android.bp index 68bcb7e6ca..77dff521c2 100644 --- a/test/559-checker-rtp-ifnotnull/Android.bp +++ b/test/559-checker-rtp-ifnotnull/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-559-checker-rtp-ifnotnull-expected-stdout", ":art-run-test-559-checker-rtp-ifnotnull-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/560-packed-switch/Android.bp b/test/560-packed-switch/Android.bp index 418aa6de6e..047897f544 100644 --- a/test/560-packed-switch/Android.bp +++ b/test/560-packed-switch/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-560-packed-switch-expected-stdout", ":art-run-test-560-packed-switch-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/561-divrem/Android.bp b/test/561-divrem/Android.bp index b07e10eaf0..7cefc23e5e 100644 --- a/test/561-divrem/Android.bp +++ b/test/561-divrem/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-561-divrem-expected-stdout", ":art-run-test-561-divrem-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/561-shared-slowpaths/Android.bp b/test/561-shared-slowpaths/Android.bp index 1058c0c30e..120d3ff1c8 100644 --- a/test/561-shared-slowpaths/Android.bp +++ b/test/561-shared-slowpaths/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-561-shared-slowpaths-expected-stdout", ":art-run-test-561-shared-slowpaths-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/562-bce-preheader/Android.bp b/test/562-bce-preheader/Android.bp index d7c979290b..e3107e7df9 100644 --- a/test/562-bce-preheader/Android.bp +++ b/test/562-bce-preheader/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-562-bce-preheader-expected-stdout", ":art-run-test-562-bce-preheader-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/562-checker-no-intermediate/Android.bp b/test/562-checker-no-intermediate/Android.bp index 1ac31425ef..72696ef754 100644 --- a/test/562-checker-no-intermediate/Android.bp +++ b/test/562-checker-no-intermediate/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-562-checker-no-intermediate-expected-stdout", ":art-run-test-562-checker-no-intermediate-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/563-checker-invoke-super/Android.bp b/test/563-checker-invoke-super/Android.bp index 1097d85d34..6111fd0e04 100644 --- a/test/563-checker-invoke-super/Android.bp +++ b/test/563-checker-invoke-super/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-563-checker-invoke-super-expected-stdout", ":art-run-test-563-checker-invoke-super-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/564-checker-bitcount/Android.bp b/test/564-checker-bitcount/Android.bp index 85c81bbc9a..21e55d9430 100644 --- a/test/564-checker-bitcount/Android.bp +++ b/test/564-checker-bitcount/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-564-checker-bitcount-expected-stdout", ":art-run-test-564-checker-bitcount-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/564-checker-inline-loop/Android.bp b/test/564-checker-inline-loop/Android.bp index 6f0a15948c..dec0f92d0d 100644 --- a/test/564-checker-inline-loop/Android.bp +++ b/test/564-checker-inline-loop/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-564-checker-inline-loop-expected-stdout", ":art-run-test-564-checker-inline-loop-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/564-checker-negbitwise/Android.bp b/test/564-checker-negbitwise/Android.bp index 8d658a18a2..733ae37112 100644 --- a/test/564-checker-negbitwise/Android.bp +++ b/test/564-checker-negbitwise/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-564-checker-negbitwise-expected-stdout", ":art-run-test-564-checker-negbitwise-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/565-checker-condition-liveness/Android.bp b/test/565-checker-condition-liveness/Android.bp index c70f56a5a4..0eb89e9180 100644 --- a/test/565-checker-condition-liveness/Android.bp +++ b/test/565-checker-condition-liveness/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-565-checker-condition-liveness-expected-stdout", ":art-run-test-565-checker-condition-liveness-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/566-checker-codegen-select/Android.bp b/test/566-checker-codegen-select/Android.bp index 27c5f4838a..523180b09e 100644 --- a/test/566-checker-codegen-select/Android.bp +++ b/test/566-checker-codegen-select/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-566-checker-codegen-select-expected-stdout", ":art-run-test-566-checker-codegen-select-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/567-checker-builder-intrinsics/Android.bp b/test/567-checker-builder-intrinsics/Android.bp index 5bf3c030c7..a47bc51876 100644 --- a/test/567-checker-builder-intrinsics/Android.bp +++ b/test/567-checker-builder-intrinsics/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-567-checker-builder-intrinsics-expected-stdout", ":art-run-test-567-checker-builder-intrinsics-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/568-checker-onebit/Android.bp b/test/568-checker-onebit/Android.bp index 649b81cc25..7a9a417150 100644 --- a/test/568-checker-onebit/Android.bp +++ b/test/568-checker-onebit/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-568-checker-onebit-expected-stdout", ":art-run-test-568-checker-onebit-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/570-checker-select/Android.bp b/test/570-checker-select/Android.bp index e41303dba7..61a62b1140 100644 --- a/test/570-checker-select/Android.bp +++ b/test/570-checker-select/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-570-checker-select-expected-stdout", ":art-run-test-570-checker-select-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/572-checker-array-get-regression/Android.bp b/test/572-checker-array-get-regression/Android.bp index 415a9f1c30..71b9af9e64 100644 --- a/test/572-checker-array-get-regression/Android.bp +++ b/test/572-checker-array-get-regression/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-572-checker-array-get-regression-expected-stdout", ":art-run-test-572-checker-array-get-regression-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/573-checker-checkcast-regression/Android.bp b/test/573-checker-checkcast-regression/Android.bp index cf7186f734..51173e3d33 100644 --- a/test/573-checker-checkcast-regression/Android.bp +++ b/test/573-checker-checkcast-regression/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-573-checker-checkcast-regression-expected-stdout", ":art-run-test-573-checker-checkcast-regression-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/576-polymorphic-inlining/Android.bp b/test/576-polymorphic-inlining/Android.bp index f40b51e7a4..e326fa81cf 100644 --- a/test/576-polymorphic-inlining/Android.bp +++ b/test/576-polymorphic-inlining/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-576-polymorphic-inlining-expected-stdout", ":art-run-test-576-polymorphic-inlining-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/577-checker-fp2int/Android.bp b/test/577-checker-fp2int/Android.bp index cd0a5d3dfc..8141ed3e2c 100644 --- a/test/577-checker-fp2int/Android.bp +++ b/test/577-checker-fp2int/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-577-checker-fp2int-expected-stdout", ":art-run-test-577-checker-fp2int-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/578-bce-visit/Android.bp b/test/578-bce-visit/Android.bp index bddc53ebf3..92059aad7c 100644 --- a/test/578-bce-visit/Android.bp +++ b/test/578-bce-visit/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-578-bce-visit-expected-stdout", ":art-run-test-578-bce-visit-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/578-polymorphic-inlining/Android.bp b/test/578-polymorphic-inlining/Android.bp index 207c91b28c..4d670d877c 100644 --- a/test/578-polymorphic-inlining/Android.bp +++ b/test/578-polymorphic-inlining/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-578-polymorphic-inlining-expected-stdout", ":art-run-test-578-polymorphic-inlining-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/579-inline-infinite/Android.bp b/test/579-inline-infinite/Android.bp index 39fce3f30c..a321d3cfc0 100644 --- a/test/579-inline-infinite/Android.bp +++ b/test/579-inline-infinite/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-579-inline-infinite-expected-stdout", ":art-run-test-579-inline-infinite-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/580-checker-fp16/Android.bp b/test/580-checker-fp16/Android.bp index a165fe7ae2..e57c102324 100644 --- a/test/580-checker-fp16/Android.bp +++ b/test/580-checker-fp16/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-580-checker-fp16-expected-stdout", ":art-run-test-580-checker-fp16-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/580-checker-round/Android.bp b/test/580-checker-round/Android.bp index 5a05b19547..7ae5eefda3 100644 --- a/test/580-checker-round/Android.bp +++ b/test/580-checker-round/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-580-checker-round-expected-stdout", ":art-run-test-580-checker-round-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/580-checker-string-fact-intrinsics/Android.bp b/test/580-checker-string-fact-intrinsics/Android.bp index a0bb8442f5..46236b25e3 100644 --- a/test/580-checker-string-fact-intrinsics/Android.bp +++ b/test/580-checker-string-fact-intrinsics/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-580-checker-string-fact-intrinsics-expected-stdout", ":art-run-test-580-checker-string-fact-intrinsics-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/580-crc32/Android.bp b/test/580-crc32/Android.bp index 7d209491dd..3ee42fe188 100644 --- a/test/580-crc32/Android.bp +++ b/test/580-crc32/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-580-crc32-expected-stdout", ":art-run-test-580-crc32-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/581-checker-rtp/Android.bp b/test/581-checker-rtp/Android.bp index ddfbe0f707..ebc79d516e 100644 --- a/test/581-checker-rtp/Android.bp +++ b/test/581-checker-rtp/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-581-checker-rtp-expected-stdout", ":art-run-test-581-checker-rtp-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/582-checker-bce-length/Android.bp b/test/582-checker-bce-length/Android.bp index 937fd2d200..348aa7541a 100644 --- a/test/582-checker-bce-length/Android.bp +++ b/test/582-checker-bce-length/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-582-checker-bce-length-expected-stdout", ":art-run-test-582-checker-bce-length-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/583-checker-zero/Android.bp b/test/583-checker-zero/Android.bp index 4952dec11f..2e973a6600 100644 --- a/test/583-checker-zero/Android.bp +++ b/test/583-checker-zero/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-583-checker-zero-expected-stdout", ":art-run-test-583-checker-zero-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/584-checker-div-bool/Android.bp b/test/584-checker-div-bool/Android.bp index 5e7f928641..4aa2523851 100644 --- a/test/584-checker-div-bool/Android.bp +++ b/test/584-checker-div-bool/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-584-checker-div-bool-expected-stdout", ":art-run-test-584-checker-div-bool-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/589-super-imt/Android.bp b/test/589-super-imt/Android.bp index 5a79bc98e2..54ca9ac594 100644 --- a/test/589-super-imt/Android.bp +++ b/test/589-super-imt/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-589-super-imt-expected-stdout", ":art-run-test-589-super-imt-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/590-checker-arr-set-null-regression/Android.bp b/test/590-checker-arr-set-null-regression/Android.bp index e42602ab53..b6ee45fa77 100644 --- a/test/590-checker-arr-set-null-regression/Android.bp +++ b/test/590-checker-arr-set-null-regression/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-590-checker-arr-set-null-regression-expected-stdout", ":art-run-test-590-checker-arr-set-null-regression-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/591-checker-regression-dead-loop/Android.bp b/test/591-checker-regression-dead-loop/Android.bp index b2138a8f7d..465ad94b7b 100644 --- a/test/591-checker-regression-dead-loop/Android.bp +++ b/test/591-checker-regression-dead-loop/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-591-checker-regression-dead-loop-expected-stdout", ":art-run-test-591-checker-regression-dead-loop-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/593-checker-long-2-float-regression/Android.bp b/test/593-checker-long-2-float-regression/Android.bp index bc5adc7c55..5ae8dde99d 100644 --- a/test/593-checker-long-2-float-regression/Android.bp +++ b/test/593-checker-long-2-float-regression/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-593-checker-long-2-float-regression-expected-stdout", ":art-run-test-593-checker-long-2-float-regression-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/594-checker-array-alias/Android.bp b/test/594-checker-array-alias/Android.bp index 82e5a885fa..6e8f109071 100644 --- a/test/594-checker-array-alias/Android.bp +++ b/test/594-checker-array-alias/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-594-checker-array-alias-expected-stdout", ":art-run-test-594-checker-array-alias-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/594-load-string-regression/Android.bp b/test/594-load-string-regression/Android.bp index b1a86440a3..95b64283b7 100644 --- a/test/594-load-string-regression/Android.bp +++ b/test/594-load-string-regression/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-594-load-string-regression-expected-stdout", ":art-run-test-594-load-string-regression-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/603-checker-instanceof/Android.bp b/test/603-checker-instanceof/Android.bp index 3fcc54d0fd..a8ffcb1e0b 100644 --- a/test/603-checker-instanceof/Android.bp +++ b/test/603-checker-instanceof/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-603-checker-instanceof-expected-stdout", ":art-run-test-603-checker-instanceof-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/605-new-string-from-bytes/Android.bp b/test/605-new-string-from-bytes/Android.bp index 4bbfa10ee6..d148c61779 100644 --- a/test/605-new-string-from-bytes/Android.bp +++ b/test/605-new-string-from-bytes/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-605-new-string-from-bytes-expected-stdout", ":art-run-test-605-new-string-from-bytes-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/607-daemon-stress/Android.bp b/test/607-daemon-stress/Android.bp index 083bd7c87e..01a22f55f5 100644 --- a/test/607-daemon-stress/Android.bp +++ b/test/607-daemon-stress/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-607-daemon-stress-expected-stdout", ":art-run-test-607-daemon-stress-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/609-checker-inline-interface/Android.bp b/test/609-checker-inline-interface/Android.bp index 33c2cacd0b..ad83513441 100644 --- a/test/609-checker-inline-interface/Android.bp +++ b/test/609-checker-inline-interface/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-609-checker-inline-interface-expected-stdout", ":art-run-test-609-checker-inline-interface-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/609-checker-x86-bounds-check/Android.bp b/test/609-checker-x86-bounds-check/Android.bp index 81591bc60d..747ba17a71 100644 --- a/test/609-checker-x86-bounds-check/Android.bp +++ b/test/609-checker-x86-bounds-check/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-609-checker-x86-bounds-check-expected-stdout", ":art-run-test-609-checker-x86-bounds-check-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/610-arraycopy/Android.bp b/test/610-arraycopy/Android.bp index c049136cb8..7e0a01765e 100644 --- a/test/610-arraycopy/Android.bp +++ b/test/610-arraycopy/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-610-arraycopy-expected-stdout", ":art-run-test-610-arraycopy-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/611-checker-simplify-if/Android.bp b/test/611-checker-simplify-if/Android.bp index 7637af3da1..e138164f20 100644 --- a/test/611-checker-simplify-if/Android.bp +++ b/test/611-checker-simplify-if/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-611-checker-simplify-if-expected-stdout", ":art-run-test-611-checker-simplify-if-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/614-checker-dump-constant-location/Android.bp b/test/614-checker-dump-constant-location/Android.bp index 566bdaed6c..f7c73c7368 100644 --- a/test/614-checker-dump-constant-location/Android.bp +++ b/test/614-checker-dump-constant-location/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-614-checker-dump-constant-location-expected-stdout", ":art-run-test-614-checker-dump-constant-location-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/615-checker-arm64-store-zero/Android.bp b/test/615-checker-arm64-store-zero/Android.bp index bd5acd9ba9..ffb53d73d6 100644 --- a/test/615-checker-arm64-store-zero/Android.bp +++ b/test/615-checker-arm64-store-zero/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-615-checker-arm64-store-zero-expected-stdout", ":art-run-test-615-checker-arm64-store-zero-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/617-clinit-oome/Android.bp b/test/617-clinit-oome/Android.bp index a58c888aa2..432f6d3517 100644 --- a/test/617-clinit-oome/Android.bp +++ b/test/617-clinit-oome/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-617-clinit-oome-expected-stdout", ":art-run-test-617-clinit-oome-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/618-checker-induction/Android.bp b/test/618-checker-induction/Android.bp index 6d1a0542f9..17fa0f2637 100644 --- a/test/618-checker-induction/Android.bp +++ b/test/618-checker-induction/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-618-checker-induction-expected-stdout", ":art-run-test-618-checker-induction-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/619-checker-current-method/Android.bp b/test/619-checker-current-method/Android.bp index 10e2d9a768..6fc753331a 100644 --- a/test/619-checker-current-method/Android.bp +++ b/test/619-checker-current-method/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-619-checker-current-method-expected-stdout", ":art-run-test-619-checker-current-method-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/620-checker-bce-intrinsics/Android.bp b/test/620-checker-bce-intrinsics/Android.bp index 0014b038a4..c18e8cbc82 100644 --- a/test/620-checker-bce-intrinsics/Android.bp +++ b/test/620-checker-bce-intrinsics/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-620-checker-bce-intrinsics-expected-stdout", ":art-run-test-620-checker-bce-intrinsics-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/622-checker-bce-regressions/Android.bp b/test/622-checker-bce-regressions/Android.bp index b14a5a0365..8abeac6da0 100644 --- a/test/622-checker-bce-regressions/Android.bp +++ b/test/622-checker-bce-regressions/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-622-checker-bce-regressions-expected-stdout", ":art-run-test-622-checker-bce-regressions-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/625-checker-licm-regressions/Android.bp b/test/625-checker-licm-regressions/Android.bp index 95175b0c0f..f4484b9af7 100644 --- a/test/625-checker-licm-regressions/Android.bp +++ b/test/625-checker-licm-regressions/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-625-checker-licm-regressions-expected-stdout", ":art-run-test-625-checker-licm-regressions-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/627-checker-unroll/Android.bp b/test/627-checker-unroll/Android.bp index 1c2baca9d3..83f619efd3 100644 --- a/test/627-checker-unroll/Android.bp +++ b/test/627-checker-unroll/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-627-checker-unroll-expected-stdout", ":art-run-test-627-checker-unroll-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/628-vdex/Android.bp b/test/628-vdex/Android.bp index 7b768fc800..c5ae620527 100644 --- a/test/628-vdex/Android.bp +++ b/test/628-vdex/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-628-vdex-expected-stdout", ":art-run-test-628-vdex-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/631-checker-get-class/Android.bp b/test/631-checker-get-class/Android.bp index f08cfe0648..03d75bf73a 100644 --- a/test/631-checker-get-class/Android.bp +++ b/test/631-checker-get-class/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-631-checker-get-class-expected-stdout", ":art-run-test-631-checker-get-class-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/632-checker-char-at-bounds/Android.bp b/test/632-checker-char-at-bounds/Android.bp index d7f680a3c9..3f6fe96947 100644 --- a/test/632-checker-char-at-bounds/Android.bp +++ b/test/632-checker-char-at-bounds/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-632-checker-char-at-bounds-expected-stdout", ":art-run-test-632-checker-char-at-bounds-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/635-checker-arm64-volatile-load-cc/Android.bp b/test/635-checker-arm64-volatile-load-cc/Android.bp index 253abb1027..4ab74a43e8 100644 --- a/test/635-checker-arm64-volatile-load-cc/Android.bp +++ b/test/635-checker-arm64-volatile-load-cc/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-635-checker-arm64-volatile-load-cc-expected-stdout", ":art-run-test-635-checker-arm64-volatile-load-cc-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/636-arm64-veneer-pool/Android.bp b/test/636-arm64-veneer-pool/Android.bp index 9d8f7ccd19..16045f0286 100644 --- a/test/636-arm64-veneer-pool/Android.bp +++ b/test/636-arm64-veneer-pool/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-636-arm64-veneer-pool-expected-stdout", ":art-run-test-636-arm64-veneer-pool-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/637-checker-throw-inline/Android.bp b/test/637-checker-throw-inline/Android.bp index f44e64bcd7..9de3ae891d 100644 --- a/test/637-checker-throw-inline/Android.bp +++ b/test/637-checker-throw-inline/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-637-checker-throw-inline-expected-stdout", ":art-run-test-637-checker-throw-inline-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/639-checker-code-sinking/Android.bp b/test/639-checker-code-sinking/Android.bp index 7772a68eaa..b88763c205 100644 --- a/test/639-checker-code-sinking/Android.bp +++ b/test/639-checker-code-sinking/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-639-checker-code-sinking-expected-stdout", ":art-run-test-639-checker-code-sinking-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/640-checker-boolean-simd/Android.bp b/test/640-checker-boolean-simd/Android.bp index 89e6ac7ace..9b5cc57256 100644 --- a/test/640-checker-boolean-simd/Android.bp +++ b/test/640-checker-boolean-simd/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-640-checker-boolean-simd-expected-stdout", ":art-run-test-640-checker-boolean-simd-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/640-checker-integer-valueof/Android.bp b/test/640-checker-integer-valueof/Android.bp index aca0bb3b59..98a7992320 100644 --- a/test/640-checker-integer-valueof/Android.bp +++ b/test/640-checker-integer-valueof/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-640-checker-integer-valueof-expected-stdout", ":art-run-test-640-checker-integer-valueof-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/640-checker-simd/Android.bp b/test/640-checker-simd/Android.bp index 45d08854cf..591a06abaa 100644 --- a/test/640-checker-simd/Android.bp +++ b/test/640-checker-simd/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-640-checker-simd-expected-stdout", ":art-run-test-640-checker-simd-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/641-checker-arraycopy/Android.bp b/test/641-checker-arraycopy/Android.bp index fabb0fe96f..5c02f3980f 100644 --- a/test/641-checker-arraycopy/Android.bp +++ b/test/641-checker-arraycopy/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-641-checker-arraycopy-expected-stdout", ":art-run-test-641-checker-arraycopy-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/641-iterations/Android.bp b/test/641-iterations/Android.bp index be127bb3fe..1bd30bb88a 100644 --- a/test/641-iterations/Android.bp +++ b/test/641-iterations/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-641-iterations-expected-stdout", ":art-run-test-641-iterations-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/643-checker-bogus-ic/Android.bp b/test/643-checker-bogus-ic/Android.bp index ee2b7dc697..1ada4c20b1 100644 --- a/test/643-checker-bogus-ic/Android.bp +++ b/test/643-checker-bogus-ic/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-643-checker-bogus-ic-expected-stdout", ":art-run-test-643-checker-bogus-ic-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/645-checker-abs-simd/Android.bp b/test/645-checker-abs-simd/Android.bp index bf29f92e13..0579dc1ab4 100644 --- a/test/645-checker-abs-simd/Android.bp +++ b/test/645-checker-abs-simd/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-645-checker-abs-simd-expected-stdout", ":art-run-test-645-checker-abs-simd-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/646-checker-arraycopy-large-cst-pos/Android.bp b/test/646-checker-arraycopy-large-cst-pos/Android.bp index 983c9df0ca..601a2fc8bd 100644 --- a/test/646-checker-arraycopy-large-cst-pos/Android.bp +++ b/test/646-checker-arraycopy-large-cst-pos/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-646-checker-arraycopy-large-cst-pos-expected-stdout", ":art-run-test-646-checker-arraycopy-large-cst-pos-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/646-checker-long-const-to-int/Android.bp b/test/646-checker-long-const-to-int/Android.bp index be5cf75d15..295c1abb9c 100644 --- a/test/646-checker-long-const-to-int/Android.bp +++ b/test/646-checker-long-const-to-int/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-646-checker-long-const-to-int-expected-stdout", ":art-run-test-646-checker-long-const-to-int-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/646-checker-simd-hadd/Android.bp b/test/646-checker-simd-hadd/Android.bp index 12df43d5f1..dab5f0a385 100644 --- a/test/646-checker-simd-hadd/Android.bp +++ b/test/646-checker-simd-hadd/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-646-checker-simd-hadd-expected-stdout", ":art-run-test-646-checker-simd-hadd-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/650-checker-inline-access-thunks/Android.bp b/test/650-checker-inline-access-thunks/Android.bp index 2b98cce611..7a47397b37 100644 --- a/test/650-checker-inline-access-thunks/Android.bp +++ b/test/650-checker-inline-access-thunks/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-650-checker-inline-access-thunks-expected-stdout", ":art-run-test-650-checker-inline-access-thunks-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/654-checker-periodic/Android.bp b/test/654-checker-periodic/Android.bp index 79e38bb5ce..d92884fc75 100644 --- a/test/654-checker-periodic/Android.bp +++ b/test/654-checker-periodic/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-654-checker-periodic-expected-stdout", ":art-run-test-654-checker-periodic-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/655-checker-simd-arm-opt/Android.bp b/test/655-checker-simd-arm-opt/Android.bp index 50f18fedcd..f3d563c1b0 100644 --- a/test/655-checker-simd-arm-opt/Android.bp +++ b/test/655-checker-simd-arm-opt/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-655-checker-simd-arm-opt-expected-stdout", ":art-run-test-655-checker-simd-arm-opt-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/656-checker-simd-opt/Android.bp b/test/656-checker-simd-opt/Android.bp index 2b72352ffe..ef586f0211 100644 --- a/test/656-checker-simd-opt/Android.bp +++ b/test/656-checker-simd-opt/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-656-checker-simd-opt-expected-stdout", ":art-run-test-656-checker-simd-opt-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/657-branches/Android.bp b/test/657-branches/Android.bp index 70c422f6b1..58d1944845 100644 --- a/test/657-branches/Android.bp +++ b/test/657-branches/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-657-branches-expected-stdout", ":art-run-test-657-branches-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/658-fp-read-barrier/Android.bp b/test/658-fp-read-barrier/Android.bp index fdb2b35b7b..3e694cd197 100644 --- a/test/658-fp-read-barrier/Android.bp +++ b/test/658-fp-read-barrier/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-658-fp-read-barrier-expected-stdout", ":art-run-test-658-fp-read-barrier-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/659-unpadded-array/Android.bp b/test/659-unpadded-array/Android.bp index 05360117d8..2aa4f7b4a5 100644 --- a/test/659-unpadded-array/Android.bp +++ b/test/659-unpadded-array/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-659-unpadded-array-expected-stdout", ":art-run-test-659-unpadded-array-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/660-checker-sad/Android.bp b/test/660-checker-sad/Android.bp index 76b8c7bf33..231c76d548 100644 --- a/test/660-checker-sad/Android.bp +++ b/test/660-checker-sad/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-660-checker-sad-expected-stdout", ":art-run-test-660-checker-sad-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/660-checker-simd-sad/Android.bp b/test/660-checker-simd-sad/Android.bp index f751904c34..a89f1839bc 100644 --- a/test/660-checker-simd-sad/Android.bp +++ b/test/660-checker-simd-sad/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-660-checker-simd-sad-expected-stdout", ":art-run-test-660-checker-simd-sad-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/661-checker-simd-cf-loops/Android.bp b/test/661-checker-simd-cf-loops/Android.bp index 8d2c193c02..fb2ce49f45 100644 --- a/test/661-checker-simd-cf-loops/Android.bp +++ b/test/661-checker-simd-cf-loops/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-661-checker-simd-cf-loops-expected-stdout", ":art-run-test-661-checker-simd-cf-loops-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/661-checker-simd-reduc/Android.bp b/test/661-checker-simd-reduc/Android.bp index 65e00c7eea..61dbfd52c2 100644 --- a/test/661-checker-simd-reduc/Android.bp +++ b/test/661-checker-simd-reduc/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-661-checker-simd-reduc-expected-stdout", ":art-run-test-661-checker-simd-reduc-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/662-regression-alias/Android.bp b/test/662-regression-alias/Android.bp index 7d38415cc4..6b9407349f 100644 --- a/test/662-regression-alias/Android.bp +++ b/test/662-regression-alias/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-662-regression-alias-expected-stdout", ":art-run-test-662-regression-alias-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/663-checker-select-generator/Android.bp b/test/663-checker-select-generator/Android.bp index c6b9087c81..0c3af98a20 100644 --- a/test/663-checker-select-generator/Android.bp +++ b/test/663-checker-select-generator/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-663-checker-select-generator-expected-stdout", ":art-run-test-663-checker-select-generator-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/665-checker-simd-zero/Android.bp b/test/665-checker-simd-zero/Android.bp index 23e9f0988f..8f921f711e 100644 --- a/test/665-checker-simd-zero/Android.bp +++ b/test/665-checker-simd-zero/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-665-checker-simd-zero-expected-stdout", ":art-run-test-665-checker-simd-zero-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/666-dex-cache-itf/Android.bp b/test/666-dex-cache-itf/Android.bp index f7f27f68ba..1b13975f1a 100644 --- a/test/666-dex-cache-itf/Android.bp +++ b/test/666-dex-cache-itf/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-666-dex-cache-itf-expected-stdout", ":art-run-test-666-dex-cache-itf-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/667-checker-simd-alignment/Android.bp b/test/667-checker-simd-alignment/Android.bp index 0426aac25f..2e23174ec7 100644 --- a/test/667-checker-simd-alignment/Android.bp +++ b/test/667-checker-simd-alignment/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-667-checker-simd-alignment-expected-stdout", ":art-run-test-667-checker-simd-alignment-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/667-out-of-bounds/Android.bp b/test/667-out-of-bounds/Android.bp index 97185960f9..8e0ead23a7 100644 --- a/test/667-out-of-bounds/Android.bp +++ b/test/667-out-of-bounds/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-667-out-of-bounds-expected-stdout", ":art-run-test-667-out-of-bounds-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/669-checker-break/Android.bp b/test/669-checker-break/Android.bp index 0eb41a281a..6b69db19f0 100644 --- a/test/669-checker-break/Android.bp +++ b/test/669-checker-break/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-669-checker-break-expected-stdout", ":art-run-test-669-checker-break-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/671-npe-field-opts/Android.bp b/test/671-npe-field-opts/Android.bp index 4fbdd961f0..a4997fa718 100644 --- a/test/671-npe-field-opts/Android.bp +++ b/test/671-npe-field-opts/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-671-npe-field-opts-expected-stdout", ":art-run-test-671-npe-field-opts-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/672-checker-throw-method/Android.bp b/test/672-checker-throw-method/Android.bp index 612b37f4df..7e4a4fd9ae 100644 --- a/test/672-checker-throw-method/Android.bp +++ b/test/672-checker-throw-method/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-672-checker-throw-method-expected-stdout", ":art-run-test-672-checker-throw-method-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/673-checker-throw-vmethod/Android.bp b/test/673-checker-throw-vmethod/Android.bp index bfbccc492e..12a7c6f768 100644 --- a/test/673-checker-throw-vmethod/Android.bp +++ b/test/673-checker-throw-vmethod/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-673-checker-throw-vmethod-expected-stdout", ":art-run-test-673-checker-throw-vmethod-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/676-proxy-jit-at-first-use/Android.bp b/test/676-proxy-jit-at-first-use/Android.bp index f8ab7bbdf4..9b1288e504 100644 --- a/test/676-proxy-jit-at-first-use/Android.bp +++ b/test/676-proxy-jit-at-first-use/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-676-proxy-jit-at-first-use-expected-stdout", ":art-run-test-676-proxy-jit-at-first-use-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/677-fsi2/Android.bp b/test/677-fsi2/Android.bp index c95c227bcd..a55a3c1439 100644 --- a/test/677-fsi2/Android.bp +++ b/test/677-fsi2/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-677-fsi2-expected-stdout", ":art-run-test-677-fsi2-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/678-quickening/Android.bp b/test/678-quickening/Android.bp index 2dcb19c087..cb8498e8d2 100644 --- a/test/678-quickening/Android.bp +++ b/test/678-quickening/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-678-quickening-expected-stdout", ":art-run-test-678-quickening-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/684-checker-simd-dotprod/Android.bp b/test/684-checker-simd-dotprod/Android.bp index 1410e9186c..fcd8a8be9a 100644 --- a/test/684-checker-simd-dotprod/Android.bp +++ b/test/684-checker-simd-dotprod/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-684-checker-simd-dotprod-expected-stdout", ":art-run-test-684-checker-simd-dotprod-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/684-select-condition/Android.bp b/test/684-select-condition/Android.bp index 4360d5ddbe..031d151064 100644 --- a/test/684-select-condition/Android.bp +++ b/test/684-select-condition/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-684-select-condition-expected-stdout", ":art-run-test-684-select-condition-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/689-multi-catch/Android.bp b/test/689-multi-catch/Android.bp index 3dbf0fb04b..e544eaee0c 100644 --- a/test/689-multi-catch/Android.bp +++ b/test/689-multi-catch/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-689-multi-catch-expected-stdout", ":art-run-test-689-multi-catch-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/694-clinit-jit/Android.bp b/test/694-clinit-jit/Android.bp index 2f25ec063f..c4408d77a1 100644 --- a/test/694-clinit-jit/Android.bp +++ b/test/694-clinit-jit/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-694-clinit-jit-expected-stdout", ":art-run-test-694-clinit-jit-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/695-simplify-throws/Android.bp b/test/695-simplify-throws/Android.bp index d6d7c7c303..22948eb7b2 100644 --- a/test/695-simplify-throws/Android.bp +++ b/test/695-simplify-throws/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-695-simplify-throws-expected-stdout", ":art-run-test-695-simplify-throws-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/696-loop/Android.bp b/test/696-loop/Android.bp index b39271f034..09e48c0076 100644 --- a/test/696-loop/Android.bp +++ b/test/696-loop/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-696-loop-expected-stdout", ":art-run-test-696-loop-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/697-checker-string-append/Android.bp b/test/697-checker-string-append/Android.bp index 767e97023f..6e9d3d8e06 100644 --- a/test/697-checker-string-append/Android.bp +++ b/test/697-checker-string-append/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-697-checker-string-append-expected-stdout", ":art-run-test-697-checker-string-append-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/698-selects/Android.bp b/test/698-selects/Android.bp index a3be249bb0..e0a9eec4a2 100644 --- a/test/698-selects/Android.bp +++ b/test/698-selects/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-698-selects-expected-stdout", ":art-run-test-698-selects-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/700-LoadArgRegs/Android.bp b/test/700-LoadArgRegs/Android.bp index bbaa28d645..26472ce613 100644 --- a/test/700-LoadArgRegs/Android.bp +++ b/test/700-LoadArgRegs/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-700-LoadArgRegs-expected-stdout", ":art-run-test-700-LoadArgRegs-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/703-floating-point-div/Android.bp b/test/703-floating-point-div/Android.bp index 42ae166875..dd8a012ff8 100644 --- a/test/703-floating-point-div/Android.bp +++ b/test/703-floating-point-div/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-703-floating-point-div-expected-stdout", ":art-run-test-703-floating-point-div-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/704-multiply-accumulate/Android.bp b/test/704-multiply-accumulate/Android.bp index 3cd5ba18ea..838768a2fb 100644 --- a/test/704-multiply-accumulate/Android.bp +++ b/test/704-multiply-accumulate/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-704-multiply-accumulate-expected-stdout", ":art-run-test-704-multiply-accumulate-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/705-register-conflict/Android.bp b/test/705-register-conflict/Android.bp index 6182c2f329..6304d4a630 100644 --- a/test/705-register-conflict/Android.bp +++ b/test/705-register-conflict/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-705-register-conflict-expected-stdout", ":art-run-test-705-register-conflict-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/711-checker-type-conversion/Android.bp b/test/711-checker-type-conversion/Android.bp index f9ae9d0574..c09233cfae 100644 --- a/test/711-checker-type-conversion/Android.bp +++ b/test/711-checker-type-conversion/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-711-checker-type-conversion-expected-stdout", ":art-run-test-711-checker-type-conversion-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/713-varhandle-invokers/Android.bp b/test/713-varhandle-invokers/Android.bp index 8719d381cd..0507df592f 100644 --- a/test/713-varhandle-invokers/Android.bp +++ b/test/713-varhandle-invokers/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-713-varhandle-invokers-expected-stdout", ":art-run-test-713-varhandle-invokers-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/718-zipfile-finalizer/Android.bp b/test/718-zipfile-finalizer/Android.bp index ed1dc66a3a..5019a9a8dd 100644 --- a/test/718-zipfile-finalizer/Android.bp +++ b/test/718-zipfile-finalizer/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-718-zipfile-finalizer-expected-stdout", ":art-run-test-718-zipfile-finalizer-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/719-varhandle-concurrency/Android.bp b/test/719-varhandle-concurrency/Android.bp index 4c9f46534d..f26f0ab275 100644 --- a/test/719-varhandle-concurrency/Android.bp +++ b/test/719-varhandle-concurrency/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-719-varhandle-concurrency-expected-stdout", ":art-run-test-719-varhandle-concurrency-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/721-osr/Android.bp b/test/721-osr/Android.bp index 22aa0c3e07..91601700dc 100644 --- a/test/721-osr/Android.bp +++ b/test/721-osr/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-721-osr-expected-stdout", ":art-run-test-721-osr-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/726-array-store/Android.bp b/test/726-array-store/Android.bp index dc6cc2432f..0918f14687 100644 --- a/test/726-array-store/Android.bp +++ b/test/726-array-store/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-726-array-store-expected-stdout", ":art-run-test-726-array-store-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/730-checker-inlining-super/Android.bp b/test/730-checker-inlining-super/Android.bp index 8247b65948..2de61c5950 100644 --- a/test/730-checker-inlining-super/Android.bp +++ b/test/730-checker-inlining-super/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-730-checker-inlining-super-expected-stdout", ":art-run-test-730-checker-inlining-super-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/731-bounds-check-slow-path/Android.bp b/test/731-bounds-check-slow-path/Android.bp index bc9e84b431..8427a2822b 100644 --- a/test/731-bounds-check-slow-path/Android.bp +++ b/test/731-bounds-check-slow-path/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-731-bounds-check-slow-path-expected-stdout", ":art-run-test-731-bounds-check-slow-path-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/805-TooDeepClassInstanceOf/Android.bp b/test/805-TooDeepClassInstanceOf/Android.bp index 878f126f22..baf547c669 100644 --- a/test/805-TooDeepClassInstanceOf/Android.bp +++ b/test/805-TooDeepClassInstanceOf/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-805-TooDeepClassInstanceOf-expected-stdout", ":art-run-test-805-TooDeepClassInstanceOf-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/806-TooWideClassInstanceOf/Android.bp b/test/806-TooWideClassInstanceOf/Android.bp index bdff81282d..2c7eee816c 100644 --- a/test/806-TooWideClassInstanceOf/Android.bp +++ b/test/806-TooWideClassInstanceOf/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-806-TooWideClassInstanceOf-expected-stdout", ":art-run-test-806-TooWideClassInstanceOf-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/812-recursive-default/Android.bp b/test/812-recursive-default/Android.bp index 9c2fe2c0d0..92641fb9d6 100644 --- a/test/812-recursive-default/Android.bp +++ b/test/812-recursive-default/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-812-recursive-default-expected-stdout", ":art-run-test-812-recursive-default-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/814-large-field-offsets/Android.bp b/test/814-large-field-offsets/Android.bp index e3193a876f..55f66f8b17 100644 --- a/test/814-large-field-offsets/Android.bp +++ b/test/814-large-field-offsets/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-814-large-field-offsets-expected-stdout", ":art-run-test-814-large-field-offsets-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/815-invokeinterface-default/Android.bp b/test/815-invokeinterface-default/Android.bp index 9981b02659..69868b7cc3 100644 --- a/test/815-invokeinterface-default/Android.bp +++ b/test/815-invokeinterface-default/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-815-invokeinterface-default-expected-stdout", ":art-run-test-815-invokeinterface-default-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/818-clinit-nterp/Android.bp b/test/818-clinit-nterp/Android.bp index f168de3693..a18c1ff2d1 100644 --- a/test/818-clinit-nterp/Android.bp +++ b/test/818-clinit-nterp/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-818-clinit-nterp-expected-stdout", ":art-run-test-818-clinit-nterp-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/821-madvise-willneed/Android.bp b/test/821-madvise-willneed/Android.bp index 86e883cbfa..317caec647 100644 --- a/test/821-madvise-willneed/Android.bp +++ b/test/821-madvise-willneed/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-821-madvise-willneed-expected-stdout", ":art-run-test-821-madvise-willneed-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/828-partial-lse/Android.bp b/test/828-partial-lse/Android.bp index a336150fc6..38adf221d2 100644 --- a/test/828-partial-lse/Android.bp +++ b/test/828-partial-lse/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-828-partial-lse-expected-stdout", ":art-run-test-828-partial-lse-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/834-lse/Android.bp b/test/834-lse/Android.bp index 3d44972411..265dcb3789 100644 --- a/test/834-lse/Android.bp +++ b/test/834-lse/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-834-lse-expected-stdout", ":art-run-test-834-lse-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/835-b216762268/Android.bp b/test/835-b216762268/Android.bp index a68f2ed042..799245c1a3 100644 --- a/test/835-b216762268/Android.bp +++ b/test/835-b216762268/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-835-b216762268-expected-stdout", ":art-run-test-835-b216762268-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/838-override/Android.bp b/test/838-override/Android.bp index 2ac4e210ce..ebdc31097a 100644 --- a/test/838-override/Android.bp +++ b/test/838-override/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-838-override-expected-stdout", ":art-run-test-838-override-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/839-clinit-throw/Android.bp b/test/839-clinit-throw/Android.bp index dad79f0aa2..c650aae415 100644 --- a/test/839-clinit-throw/Android.bp +++ b/test/839-clinit-throw/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-839-clinit-throw-expected-stdout", ":art-run-test-839-clinit-throw-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/841-defaults/Android.bp b/test/841-defaults/Android.bp index 2d2fce6a75..1dcba308ff 100644 --- a/test/841-defaults/Android.bp +++ b/test/841-defaults/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-841-defaults-expected-stdout", ":art-run-test-841-defaults-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/843-default-interface/Android.bp b/test/843-default-interface/Android.bp index 417166fec0..64ad0fa7a6 100644 --- a/test/843-default-interface/Android.bp +++ b/test/843-default-interface/Android.bp @@ -31,6 +31,9 @@ java_test { ":art-run-test-843-default-interface-expected-stdout", ":art-run-test-843-default-interface-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/851-null-instanceof/Android.bp b/test/851-null-instanceof/Android.bp index 42efaaac13..3054eb0b61 100644 --- a/test/851-null-instanceof/Android.bp +++ b/test/851-null-instanceof/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-851-null-instanceof-expected-stdout", ":art-run-test-851-null-instanceof-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/853-checker-inlining/Android.bp b/test/853-checker-inlining/Android.bp index f0938558a4..79d6e2eddf 100644 --- a/test/853-checker-inlining/Android.bp +++ b/test/853-checker-inlining/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-853-checker-inlining-expected-stdout", ":art-run-test-853-checker-inlining-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/856-clone/Android.bp b/test/856-clone/Android.bp index 00e47b727b..e80d0e3e74 100644 --- a/test/856-clone/Android.bp +++ b/test/856-clone/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-856-clone-expected-stdout", ":art-run-test-856-clone-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/857-default-access/Android.bp b/test/857-default-access/Android.bp index 48e21b9f77..060d18fd97 100644 --- a/test/857-default-access/Android.bp +++ b/test/857-default-access/Android.bp @@ -31,6 +31,9 @@ java_test { ":art-run-test-857-default-access-expected-stdout", ":art-run-test-857-default-access-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/858-checker-unsafe/Android.bp b/test/858-checker-unsafe/Android.bp index 1a8d46c62f..da1b8977e9 100644 --- a/test/858-checker-unsafe/Android.bp +++ b/test/858-checker-unsafe/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-858-checker-unsafe-expected-stdout", ":art-run-test-858-checker-unsafe-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/859-checker-var-handles-intrinsics/Android.bp b/test/859-checker-var-handles-intrinsics/Android.bp index f475882992..7a31a1d290 100644 --- a/test/859-checker-var-handles-intrinsics/Android.bp +++ b/test/859-checker-var-handles-intrinsics/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-859-checker-var-handles-intrinsics-expected-stdout", ":art-run-test-859-checker-var-handles-intrinsics-expected-stderr", ], + test_suites: [ + "mts-art", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, diff --git a/test/963-default-range-smali/Android.bp b/test/963-default-range-smali/Android.bp index b4cb157e47..1baf04d1c5 100644 --- a/test/963-default-range-smali/Android.bp +++ b/test/963-default-range-smali/Android.bp @@ -21,6 +21,9 @@ java_test { ":art-run-test-963-default-range-smali-expected-stdout", ":art-run-test-963-default-range-smali-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/965-default-verify/Android.bp b/test/965-default-verify/Android.bp index 40e51e0ee4..d14b458a14 100644 --- a/test/965-default-verify/Android.bp +++ b/test/965-default-verify/Android.bp @@ -31,6 +31,9 @@ java_test { ":art-run-test-965-default-verify-expected-stdout", ":art-run-test-965-default-verify-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/967-default-ame/Android.bp b/test/967-default-ame/Android.bp index ee8c864b14..703c84deb2 100644 --- a/test/967-default-ame/Android.bp +++ b/test/967-default-ame/Android.bp @@ -31,6 +31,9 @@ java_test { ":art-run-test-967-default-ame-expected-stdout", ":art-run-test-967-default-ame-expected-stderr", ], + test_suites: [ + "mts-art", + ], } // Test's expected standard output. diff --git a/test/Android.bp b/test/Android.bp index eef30336e3..9372750840 100644 --- a/test/Android.bp +++ b/test/Android.bp @@ -539,7 +539,6 @@ java_defaults { }, test_suites: [ "general-tests", - "mts-art", ], host_required: [ "art-run-test-checker", diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files index 861a758aee..69ec137432 100755 --- a/test/utils/regen-test-files +++ b/test/utils/regen-test-files @@ -661,6 +661,10 @@ class Generator: f"`test_suites` contains `{present}` but not `{absent}`") sys.exit(1) + # Do not package non-runnable ART run-tests in ART MTS (see b/363075236). + if self.is_runnable(run_test): + test_suites.append("mts-art") + run_test_module_name = ART_RUN_TEST_MODULE_NAME_PREFIX + run_test # Set the test configuration template. |