diff options
Diffstat (limited to 'test')
139 files changed, 428 insertions, 2 deletions
diff --git a/test/004-checker-UnsafeTest18/Android.bp b/test/004-checker-UnsafeTest18/Android.bp index 57b20a4a47..a58b12bed2 100644 --- a/test/004-checker-UnsafeTest18/Android.bp +++ b/test/004-checker-UnsafeTest18/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-004-checker-UnsafeTest18-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/1004-checker-volatile-ref-load/Android.bp b/test/1004-checker-volatile-ref-load/Android.bp index fe02b478b3..50ab9b8deb 100644 --- a/test/1004-checker-volatile-ref-load/Android.bp +++ b/test/1004-checker-volatile-ref-load/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-1004-checker-volatile-ref-load-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/1960-checker-bounds-codegen/Android.bp b/test/1960-checker-bounds-codegen/Android.bp index 15bfe1b66b..e576fb7e45 100644 --- a/test/1960-checker-bounds-codegen/Android.bp +++ b/test/1960-checker-bounds-codegen/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-1960-checker-bounds-codegen-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/1961-checker-loop-vectorizer/Android.bp b/test/1961-checker-loop-vectorizer/Android.bp index 9402791a87..8870ed2e99 100644 --- a/test/1961-checker-loop-vectorizer/Android.bp +++ b/test/1961-checker-loop-vectorizer/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-1961-checker-loop-vectorizer-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/2231-checker-heap-poisoning/Android.bp b/test/2231-checker-heap-poisoning/Android.bp index 6c338cb78f..3c1d51db03 100644 --- a/test/2231-checker-heap-poisoning/Android.bp +++ b/test/2231-checker-heap-poisoning/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-2231-checker-heap-poisoning-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/411-checker-hdiv-hrem-const/Android.bp b/test/411-checker-hdiv-hrem-const/Android.bp index 611c591b00..45a4f4e348 100644 --- a/test/411-checker-hdiv-hrem-const/Android.bp +++ b/test/411-checker-hdiv-hrem-const/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-411-checker-hdiv-hrem-const-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/411-checker-hdiv-hrem-pow2/Android.bp b/test/411-checker-hdiv-hrem-pow2/Android.bp index e41a03b256..cd97b0fcf7 100644 --- a/test/411-checker-hdiv-hrem-pow2/Android.bp +++ b/test/411-checker-hdiv-hrem-pow2/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-411-checker-hdiv-hrem-pow2-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/411-checker-instruct-simplifier-hrem/Android.bp b/test/411-checker-instruct-simplifier-hrem/Android.bp index cf309f989b..a7e0f00a52 100644 --- a/test/411-checker-instruct-simplifier-hrem/Android.bp +++ b/test/411-checker-instruct-simplifier-hrem/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-411-checker-instruct-simplifier-hrem-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/441-checker-inliner/Android.bp b/test/441-checker-inliner/Android.bp index f38153c3a2..68638b05ed 100644 --- a/test/441-checker-inliner/Android.bp +++ b/test/441-checker-inliner/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-441-checker-inliner-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/444-checker-nce/Android.bp b/test/444-checker-nce/Android.bp index 00ad03e208..40b24c1fd6 100644 --- a/test/444-checker-nce/Android.bp +++ b/test/444-checker-nce/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-444-checker-nce-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/445-checker-licm/Android.bp b/test/445-checker-licm/Android.bp index 42b65664b0..14cced8da2 100644 --- a/test/445-checker-licm/Android.bp +++ b/test/445-checker-licm/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-445-checker-licm-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/446-checker-inliner2/Android.bp b/test/446-checker-inliner2/Android.bp index 1d9a828586..5c27f52088 100644 --- a/test/446-checker-inliner2/Android.bp +++ b/test/446-checker-inliner2/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-446-checker-inliner2-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/447-checker-inliner3/Android.bp b/test/447-checker-inliner3/Android.bp index 1bbb52898e..14cca80777 100644 --- a/test/447-checker-inliner3/Android.bp +++ b/test/447-checker-inliner3/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-447-checker-inliner3-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/449-checker-bce-rem/Android.bp b/test/449-checker-bce-rem/Android.bp index 7090855693..b591a6bc9c 100644 --- a/test/449-checker-bce-rem/Android.bp +++ b/test/449-checker-bce-rem/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-449-checker-bce-rem-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/449-checker-bce/Android.bp b/test/449-checker-bce/Android.bp index c23d956399..98ea24277d 100644 --- a/test/449-checker-bce/Android.bp +++ b/test/449-checker-bce/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-449-checker-bce-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/450-checker-types/Android.bp b/test/450-checker-types/Android.bp index 75e6393b84..ea579b971b 100644 --- a/test/450-checker-types/Android.bp +++ b/test/450-checker-types/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-450-checker-types-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/455-checker-gvn/Android.bp b/test/455-checker-gvn/Android.bp index adf6ba219b..d102957015 100644 --- a/test/455-checker-gvn/Android.bp +++ b/test/455-checker-gvn/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-455-checker-gvn-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/464-checker-inline-sharpen-calls/Android.bp b/test/464-checker-inline-sharpen-calls/Android.bp index fed39005e3..442cb4b96e 100644 --- a/test/464-checker-inline-sharpen-calls/Android.bp +++ b/test/464-checker-inline-sharpen-calls/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-464-checker-inline-sharpen-calls-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/465-checker-clinit-gvn/Android.bp b/test/465-checker-clinit-gvn/Android.bp index d02b38ff16..0b9fba76d4 100644 --- a/test/465-checker-clinit-gvn/Android.bp +++ b/test/465-checker-clinit-gvn/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-465-checker-clinit-gvn-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/473-checker-inliner-constants/Android.bp b/test/473-checker-inliner-constants/Android.bp index b4e3f581f4..91ae059491 100644 --- a/test/473-checker-inliner-constants/Android.bp +++ b/test/473-checker-inliner-constants/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-473-checker-inliner-constants-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/474-checker-boolean-input/Android.bp b/test/474-checker-boolean-input/Android.bp index a69d74402b..fae6d7f757 100644 --- a/test/474-checker-boolean-input/Android.bp +++ b/test/474-checker-boolean-input/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-474-checker-boolean-input-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/476-checker-ctor-fence-redun-elim/Android.bp b/test/476-checker-ctor-fence-redun-elim/Android.bp index b423860001..42863d8811 100644 --- a/test/476-checker-ctor-fence-redun-elim/Android.bp +++ b/test/476-checker-ctor-fence-redun-elim/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-476-checker-ctor-fence-redun-elim-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/476-checker-ctor-memory-barrier/Android.bp b/test/476-checker-ctor-memory-barrier/Android.bp index a7ea9582f9..baee66bd8e 100644 --- a/test/476-checker-ctor-memory-barrier/Android.bp +++ b/test/476-checker-ctor-memory-barrier/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-476-checker-ctor-memory-barrier-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/477-checker-bound-type/Android.bp b/test/477-checker-bound-type/Android.bp index ad7f3c884b..c24edcf368 100644 --- a/test/477-checker-bound-type/Android.bp +++ b/test/477-checker-bound-type/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-477-checker-bound-type-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/478-checker-clinit-check-pruning/Android.bp b/test/478-checker-clinit-check-pruning/Android.bp index bcbd6974e2..1c8240eb2c 100644 --- a/test/478-checker-clinit-check-pruning/Android.bp +++ b/test/478-checker-clinit-check-pruning/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-478-checker-clinit-check-pruning-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/478-checker-inline-noreturn/Android.bp b/test/478-checker-inline-noreturn/Android.bp index 3b03957cda..f692d06152 100644 --- a/test/478-checker-inline-noreturn/Android.bp +++ b/test/478-checker-inline-noreturn/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-478-checker-inline-noreturn-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/478-checker-inliner-nested-loop/Android.bp b/test/478-checker-inliner-nested-loop/Android.bp index 2bd20787d3..58cf6e6f0f 100644 --- a/test/478-checker-inliner-nested-loop/Android.bp +++ b/test/478-checker-inliner-nested-loop/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-478-checker-inliner-nested-loop-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/480-checker-dead-blocks/Android.bp b/test/480-checker-dead-blocks/Android.bp index 146ad4d9b1..100e258f87 100644 --- a/test/480-checker-dead-blocks/Android.bp +++ b/test/480-checker-dead-blocks/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-480-checker-dead-blocks-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/482-checker-loop-back-edge-use/Android.bp b/test/482-checker-loop-back-edge-use/Android.bp index 208086a67d..af8799a8fa 100644 --- a/test/482-checker-loop-back-edge-use/Android.bp +++ b/test/482-checker-loop-back-edge-use/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-482-checker-loop-back-edge-use-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/485-checker-dce-switch/Android.bp b/test/485-checker-dce-switch/Android.bp index b9df8ba1c9..23e9e6f4c1 100644 --- a/test/485-checker-dce-switch/Android.bp +++ b/test/485-checker-dce-switch/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-485-checker-dce-switch-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/486-checker-must-do-null-check/Android.bp b/test/486-checker-must-do-null-check/Android.bp index b1b29fb605..dc4aaca79c 100644 --- a/test/486-checker-must-do-null-check/Android.bp +++ b/test/486-checker-must-do-null-check/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-486-checker-must-do-null-check-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/487-checker-inline-calls/Android.bp b/test/487-checker-inline-calls/Android.bp index ba3c049d36..ce133cbd40 100644 --- a/test/487-checker-inline-calls/Android.bp +++ b/test/487-checker-inline-calls/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-487-checker-inline-calls-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/488-checker-inline-recursive-calls/Android.bp b/test/488-checker-inline-recursive-calls/Android.bp index a7c082c430..385ba26fd8 100644 --- a/test/488-checker-inline-recursive-calls/Android.bp +++ b/test/488-checker-inline-recursive-calls/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-488-checker-inline-recursive-calls-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/490-checker-inline/Android.bp b/test/490-checker-inline/Android.bp index 5058bf14b1..a73832c3ac 100644 --- a/test/490-checker-inline/Android.bp +++ b/test/490-checker-inline/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-490-checker-inline-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/492-checker-inline-invoke-interface/Android.bp b/test/492-checker-inline-invoke-interface/Android.bp index 7e7360859a..664a7b0e08 100644 --- a/test/492-checker-inline-invoke-interface/Android.bp +++ b/test/492-checker-inline-invoke-interface/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-492-checker-inline-invoke-interface-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/493-checker-inline-invoke-interface/Android.bp b/test/493-checker-inline-invoke-interface/Android.bp index 18e75b1c30..0561f556a6 100644 --- a/test/493-checker-inline-invoke-interface/Android.bp +++ b/test/493-checker-inline-invoke-interface/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-493-checker-inline-invoke-interface-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/494-checker-instanceof-tests/Android.bp b/test/494-checker-instanceof-tests/Android.bp index b7ab6afa95..76c12ae921 100644 --- a/test/494-checker-instanceof-tests/Android.bp +++ b/test/494-checker-instanceof-tests/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-494-checker-instanceof-tests-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/495-checker-checkcast-tests/Android.bp b/test/495-checker-checkcast-tests/Android.bp index b111451b88..4fc4468d1b 100644 --- a/test/495-checker-checkcast-tests/Android.bp +++ b/test/495-checker-checkcast-tests/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-495-checker-checkcast-tests-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/496-checker-inlining-class-loader/Android.bp b/test/496-checker-inlining-class-loader/Android.bp index 39ba836c5b..ee99148a39 100644 --- a/test/496-checker-inlining-class-loader/Android.bp +++ b/test/496-checker-inlining-class-loader/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-496-checker-inlining-class-loader-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/508-checker-disassembly/Android.bp b/test/508-checker-disassembly/Android.bp index befbb6f946..d73987a932 100644 --- a/test/508-checker-disassembly/Android.bp +++ b/test/508-checker-disassembly/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-508-checker-disassembly-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/521-checker-array-set-null/Android.bp b/test/521-checker-array-set-null/Android.bp index 9f663fc043..7d500f793a 100644 --- a/test/521-checker-array-set-null/Android.bp +++ b/test/521-checker-array-set-null/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-521-checker-array-set-null-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/525-checker-arrays-fields1/Android.bp b/test/525-checker-arrays-fields1/Android.bp index 8ead082090..94b6dec64f 100644 --- a/test/525-checker-arrays-fields1/Android.bp +++ b/test/525-checker-arrays-fields1/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-525-checker-arrays-fields1-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/525-checker-arrays-fields2/Android.bp b/test/525-checker-arrays-fields2/Android.bp index 19e045a77f..9fb4105408 100644 --- a/test/525-checker-arrays-fields2/Android.bp +++ b/test/525-checker-arrays-fields2/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-525-checker-arrays-fields2-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/526-checker-caller-callee-regs/Android.bp b/test/526-checker-caller-callee-regs/Android.bp index 3ff714d70e..a5d079d726 100644 --- a/test/526-checker-caller-callee-regs/Android.bp +++ b/test/526-checker-caller-callee-regs/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-526-checker-caller-callee-regs-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/527-checker-array-access-simd/Android.bp b/test/527-checker-array-access-simd/Android.bp index 7e65eca904..f50b2befb8 100644 --- a/test/527-checker-array-access-simd/Android.bp +++ b/test/527-checker-array-access-simd/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-527-checker-array-access-simd-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/527-checker-array-access-split/Android.bp b/test/527-checker-array-access-split/Android.bp index f83bc3c13d..0e0ccf3605 100644 --- a/test/527-checker-array-access-split/Android.bp +++ b/test/527-checker-array-access-split/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-527-checker-array-access-split-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/530-checker-loops1/Android.bp b/test/530-checker-loops1/Android.bp index b9d10a43ce..c9c58cccb7 100644 --- a/test/530-checker-loops1/Android.bp +++ b/test/530-checker-loops1/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-530-checker-loops1-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/530-checker-loops2/Android.bp b/test/530-checker-loops2/Android.bp index a430f19231..47e5823ba1 100644 --- a/test/530-checker-loops2/Android.bp +++ b/test/530-checker-loops2/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-530-checker-loops2-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/530-checker-loops3/Android.bp b/test/530-checker-loops3/Android.bp index 4374193956..98c52fbfb4 100644 --- a/test/530-checker-loops3/Android.bp +++ b/test/530-checker-loops3/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-530-checker-loops3-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/530-checker-loops4/Android.bp b/test/530-checker-loops4/Android.bp index 6e2081994a..6aa12f6d54 100644 --- a/test/530-checker-loops4/Android.bp +++ b/test/530-checker-loops4/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-530-checker-loops4-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/530-checker-loops5/Android.bp b/test/530-checker-loops5/Android.bp index e99ab52693..cd4bb5592b 100644 --- a/test/530-checker-loops5/Android.bp +++ b/test/530-checker-loops5/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-530-checker-loops5-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/530-checker-lse-ctor-fences/Android.bp b/test/530-checker-lse-ctor-fences/Android.bp index 522fd355ad..cbd3fe236a 100644 --- a/test/530-checker-lse-ctor-fences/Android.bp +++ b/test/530-checker-lse-ctor-fences/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-530-checker-lse-ctor-fences-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/530-checker-lse-simd/Android.bp b/test/530-checker-lse-simd/Android.bp index 66cb220d1c..c7c5c9d6b1 100644 --- a/test/530-checker-lse-simd/Android.bp +++ b/test/530-checker-lse-simd/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-530-checker-lse-simd-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/530-checker-lse/Android.bp b/test/530-checker-lse/Android.bp index 9b7578c5cd..86cfca8924 100644 --- a/test/530-checker-lse/Android.bp +++ b/test/530-checker-lse/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-530-checker-lse-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/530-checker-lse2/Android.bp b/test/530-checker-lse2/Android.bp index 5c3a56e194..84128c366a 100644 --- a/test/530-checker-lse2/Android.bp +++ b/test/530-checker-lse2/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-530-checker-lse2-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/532-checker-nonnull-arrayset/Android.bp b/test/532-checker-nonnull-arrayset/Android.bp index 284003f47a..ec8e2a680e 100644 --- a/test/532-checker-nonnull-arrayset/Android.bp +++ b/test/532-checker-nonnull-arrayset/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-532-checker-nonnull-arrayset-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/534-checker-bce-deoptimization/Android.bp b/test/534-checker-bce-deoptimization/Android.bp index 2b2f5e58f2..7eae475e67 100644 --- a/test/534-checker-bce-deoptimization/Android.bp +++ b/test/534-checker-bce-deoptimization/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-534-checker-bce-deoptimization-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/536-checker-intrinsic-optimization/Android.bp b/test/536-checker-intrinsic-optimization/Android.bp index 5b18ce808e..9b100fb02d 100644 --- a/test/536-checker-intrinsic-optimization/Android.bp +++ b/test/536-checker-intrinsic-optimization/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-536-checker-intrinsic-optimization-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/537-checker-arraycopy/Android.bp b/test/537-checker-arraycopy/Android.bp index 67fb5efbf2..6ae51a980e 100644 --- a/test/537-checker-arraycopy/Android.bp +++ b/test/537-checker-arraycopy/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-537-checker-arraycopy-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/537-checker-jump-over-jump/Android.bp b/test/537-checker-jump-over-jump/Android.bp index 32ffd1c63a..c679d56f8e 100644 --- a/test/537-checker-jump-over-jump/Android.bp +++ b/test/537-checker-jump-over-jump/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-537-checker-jump-over-jump-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/538-checker-embed-constants/Android.bp b/test/538-checker-embed-constants/Android.bp index 738fa9de28..8e770b152b 100644 --- a/test/538-checker-embed-constants/Android.bp +++ b/test/538-checker-embed-constants/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-538-checker-embed-constants-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/540-checker-rtp-bug/Android.bp b/test/540-checker-rtp-bug/Android.bp index a068841983..7587a28be3 100644 --- a/test/540-checker-rtp-bug/Android.bp +++ b/test/540-checker-rtp-bug/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-540-checker-rtp-bug-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/548-checker-inlining-and-dce/Android.bp b/test/548-checker-inlining-and-dce/Android.bp index 83f4a795d3..5b4330ba7a 100644 --- a/test/548-checker-inlining-and-dce/Android.bp +++ b/test/548-checker-inlining-and-dce/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-548-checker-inlining-and-dce-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/549-checker-types-merge/Android.bp b/test/549-checker-types-merge/Android.bp index b35d0fb998..3e87756dfd 100644 --- a/test/549-checker-types-merge/Android.bp +++ b/test/549-checker-types-merge/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-549-checker-types-merge-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/550-checker-multiply-accumulate/Android.bp b/test/550-checker-multiply-accumulate/Android.bp index 794b506b14..c86d0b551f 100644 --- a/test/550-checker-multiply-accumulate/Android.bp +++ b/test/550-checker-multiply-accumulate/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-550-checker-multiply-accumulate-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/551-checker-clinit/Android.bp b/test/551-checker-clinit/Android.bp index 097a384d43..7abb9abb88 100644 --- a/test/551-checker-clinit/Android.bp +++ b/test/551-checker-clinit/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-551-checker-clinit-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/551-checker-shifter-operand/Android.bp b/test/551-checker-shifter-operand/Android.bp index feddad1790..8f98b9b7b9 100644 --- a/test/551-checker-shifter-operand/Android.bp +++ b/test/551-checker-shifter-operand/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-551-checker-shifter-operand-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/552-checker-sharpening/Android.bp b/test/552-checker-sharpening/Android.bp index 11ee8303ba..3c5340d5ab 100644 --- a/test/552-checker-sharpening/Android.bp +++ b/test/552-checker-sharpening/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-552-checker-sharpening-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/552-checker-x86-avx2-bit-manipulation/Android.bp b/test/552-checker-x86-avx2-bit-manipulation/Android.bp index bfa6c06e18..caa1df373a 100644 --- a/test/552-checker-x86-avx2-bit-manipulation/Android.bp +++ b/test/552-checker-x86-avx2-bit-manipulation/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-552-checker-x86-avx2-bit-manipulation-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/554-checker-rtp-checkcast/Android.bp b/test/554-checker-rtp-checkcast/Android.bp index 37f6737268..cc3dc24917 100644 --- a/test/554-checker-rtp-checkcast/Android.bp +++ b/test/554-checker-rtp-checkcast/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-554-checker-rtp-checkcast-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/557-checker-instruct-simplifier-ror/Android.bp b/test/557-checker-instruct-simplifier-ror/Android.bp index 77cd62fda6..b5a62a1f42 100644 --- a/test/557-checker-instruct-simplifier-ror/Android.bp +++ b/test/557-checker-instruct-simplifier-ror/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-557-checker-instruct-simplifier-ror-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/559-checker-rtp-ifnotnull/Android.bp b/test/559-checker-rtp-ifnotnull/Android.bp index 51feff1f9b..16b6a9d57f 100644 --- a/test/559-checker-rtp-ifnotnull/Android.bp +++ b/test/559-checker-rtp-ifnotnull/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-559-checker-rtp-ifnotnull-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/562-checker-no-intermediate/Android.bp b/test/562-checker-no-intermediate/Android.bp index b3255b36f0..a3aa86cc94 100644 --- a/test/562-checker-no-intermediate/Android.bp +++ b/test/562-checker-no-intermediate/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-562-checker-no-intermediate-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/563-checker-invoke-super/Android.bp b/test/563-checker-invoke-super/Android.bp index 3017fe6ba4..36de30ba09 100644 --- a/test/563-checker-invoke-super/Android.bp +++ b/test/563-checker-invoke-super/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-563-checker-invoke-super-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/564-checker-bitcount/Android.bp b/test/564-checker-bitcount/Android.bp index d1ff292830..fdda5d460e 100644 --- a/test/564-checker-bitcount/Android.bp +++ b/test/564-checker-bitcount/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-564-checker-bitcount-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/564-checker-inline-loop/Android.bp b/test/564-checker-inline-loop/Android.bp index 5b4cfcff9c..c02c1d8ceb 100644 --- a/test/564-checker-inline-loop/Android.bp +++ b/test/564-checker-inline-loop/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-564-checker-inline-loop-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/564-checker-negbitwise/Android.bp b/test/564-checker-negbitwise/Android.bp index 9efff1a3da..06abd31558 100644 --- a/test/564-checker-negbitwise/Android.bp +++ b/test/564-checker-negbitwise/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-564-checker-negbitwise-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/565-checker-condition-liveness/Android.bp b/test/565-checker-condition-liveness/Android.bp index b9abba4dbe..107faa6991 100644 --- a/test/565-checker-condition-liveness/Android.bp +++ b/test/565-checker-condition-liveness/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-565-checker-condition-liveness-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/566-checker-codegen-select/Android.bp b/test/566-checker-codegen-select/Android.bp index 6d9bdb5faf..a7d0deeb13 100644 --- a/test/566-checker-codegen-select/Android.bp +++ b/test/566-checker-codegen-select/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-566-checker-codegen-select-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/567-checker-builder-intrinsics/Android.bp b/test/567-checker-builder-intrinsics/Android.bp index f207599090..06c456b51c 100644 --- a/test/567-checker-builder-intrinsics/Android.bp +++ b/test/567-checker-builder-intrinsics/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-567-checker-builder-intrinsics-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/568-checker-onebit/Android.bp b/test/568-checker-onebit/Android.bp index 6a63163eee..ca1921e8dd 100644 --- a/test/568-checker-onebit/Android.bp +++ b/test/568-checker-onebit/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-568-checker-onebit-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/570-checker-select/Android.bp b/test/570-checker-select/Android.bp index 611e1eef1c..0fb2ea0746 100644 --- a/test/570-checker-select/Android.bp +++ b/test/570-checker-select/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-570-checker-select-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/572-checker-array-get-regression/Android.bp b/test/572-checker-array-get-regression/Android.bp index 592d365ae4..0bab5a6a3f 100644 --- a/test/572-checker-array-get-regression/Android.bp +++ b/test/572-checker-array-get-regression/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-572-checker-array-get-regression-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/573-checker-checkcast-regression/Android.bp b/test/573-checker-checkcast-regression/Android.bp index 6a019dd883..8548ca3455 100644 --- a/test/573-checker-checkcast-regression/Android.bp +++ b/test/573-checker-checkcast-regression/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-573-checker-checkcast-regression-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/577-checker-fp2int/Android.bp b/test/577-checker-fp2int/Android.bp index 55241dfad6..e22faa7f60 100644 --- a/test/577-checker-fp2int/Android.bp +++ b/test/577-checker-fp2int/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-577-checker-fp2int-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/580-checker-round/Android.bp b/test/580-checker-round/Android.bp index ee903e497f..31ef1d0491 100644 --- a/test/580-checker-round/Android.bp +++ b/test/580-checker-round/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-580-checker-round-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/582-checker-bce-length/Android.bp b/test/582-checker-bce-length/Android.bp index 0fac6e0f3d..b9759fe56a 100644 --- a/test/582-checker-bce-length/Android.bp +++ b/test/582-checker-bce-length/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-582-checker-bce-length-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/583-checker-zero/Android.bp b/test/583-checker-zero/Android.bp index 1da4a29aa5..83825fda4d 100644 --- a/test/583-checker-zero/Android.bp +++ b/test/583-checker-zero/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-583-checker-zero-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/584-checker-div-bool/Android.bp b/test/584-checker-div-bool/Android.bp index ce8d44abae..2b5e1cdc85 100644 --- a/test/584-checker-div-bool/Android.bp +++ b/test/584-checker-div-bool/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-584-checker-div-bool-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/590-checker-arr-set-null-regression/Android.bp b/test/590-checker-arr-set-null-regression/Android.bp index 0b3e4c8bdf..4beae2097f 100644 --- a/test/590-checker-arr-set-null-regression/Android.bp +++ b/test/590-checker-arr-set-null-regression/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-590-checker-arr-set-null-regression-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/591-checker-regression-dead-loop/Android.bp b/test/591-checker-regression-dead-loop/Android.bp index c4defaefeb..03f5723736 100644 --- a/test/591-checker-regression-dead-loop/Android.bp +++ b/test/591-checker-regression-dead-loop/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-591-checker-regression-dead-loop-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/593-checker-long-2-float-regression/Android.bp b/test/593-checker-long-2-float-regression/Android.bp index 42673bab3c..641090fe40 100644 --- a/test/593-checker-long-2-float-regression/Android.bp +++ b/test/593-checker-long-2-float-regression/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-593-checker-long-2-float-regression-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/594-checker-array-alias/Android.bp b/test/594-checker-array-alias/Android.bp index 433babef85..acde6621cf 100644 --- a/test/594-checker-array-alias/Android.bp +++ b/test/594-checker-array-alias/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-594-checker-array-alias-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/603-checker-instanceof/Android.bp b/test/603-checker-instanceof/Android.bp index 892dd07398..e996003609 100644 --- a/test/603-checker-instanceof/Android.bp +++ b/test/603-checker-instanceof/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-603-checker-instanceof-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/609-checker-inline-interface/Android.bp b/test/609-checker-inline-interface/Android.bp index b208683dbe..d16d87e712 100644 --- a/test/609-checker-inline-interface/Android.bp +++ b/test/609-checker-inline-interface/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-609-checker-inline-interface-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/609-checker-x86-bounds-check/Android.bp b/test/609-checker-x86-bounds-check/Android.bp index 1ff03aeda5..8aa790da1b 100644 --- a/test/609-checker-x86-bounds-check/Android.bp +++ b/test/609-checker-x86-bounds-check/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-609-checker-x86-bounds-check-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/611-checker-simplify-if/Android.bp b/test/611-checker-simplify-if/Android.bp index ca4cfc9af1..fcd8e49d9a 100644 --- a/test/611-checker-simplify-if/Android.bp +++ b/test/611-checker-simplify-if/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-611-checker-simplify-if-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/614-checker-dump-constant-location/Android.bp b/test/614-checker-dump-constant-location/Android.bp index 204f8cc8df..9b236cca76 100644 --- a/test/614-checker-dump-constant-location/Android.bp +++ b/test/614-checker-dump-constant-location/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-614-checker-dump-constant-location-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/615-checker-arm64-store-zero/Android.bp b/test/615-checker-arm64-store-zero/Android.bp index b218c03885..a6825cb335 100644 --- a/test/615-checker-arm64-store-zero/Android.bp +++ b/test/615-checker-arm64-store-zero/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-615-checker-arm64-store-zero-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/618-checker-induction/Android.bp b/test/618-checker-induction/Android.bp index ce4dd5f40c..193eb03328 100644 --- a/test/618-checker-induction/Android.bp +++ b/test/618-checker-induction/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-618-checker-induction-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/619-checker-current-method/Android.bp b/test/619-checker-current-method/Android.bp index 412438262c..1d54575d11 100644 --- a/test/619-checker-current-method/Android.bp +++ b/test/619-checker-current-method/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-619-checker-current-method-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/620-checker-bce-intrinsics/Android.bp b/test/620-checker-bce-intrinsics/Android.bp index 95eb3356ec..3536961808 100644 --- a/test/620-checker-bce-intrinsics/Android.bp +++ b/test/620-checker-bce-intrinsics/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-620-checker-bce-intrinsics-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/622-checker-bce-regressions/Android.bp b/test/622-checker-bce-regressions/Android.bp index 3e81da8755..5984ebe2d1 100644 --- a/test/622-checker-bce-regressions/Android.bp +++ b/test/622-checker-bce-regressions/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-622-checker-bce-regressions-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/623-checker-loop-regressions/Android.bp b/test/623-checker-loop-regressions/Android.bp index 6e710529f0..5c0b6af346 100644 --- a/test/623-checker-loop-regressions/Android.bp +++ b/test/623-checker-loop-regressions/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-623-checker-loop-regressions-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/625-checker-licm-regressions/Android.bp b/test/625-checker-licm-regressions/Android.bp index 8fcc465405..566c94efb4 100644 --- a/test/625-checker-licm-regressions/Android.bp +++ b/test/625-checker-licm-regressions/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-625-checker-licm-regressions-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/627-checker-unroll/Android.bp b/test/627-checker-unroll/Android.bp index 84e3941aa1..0a55e7e111 100644 --- a/test/627-checker-unroll/Android.bp +++ b/test/627-checker-unroll/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-627-checker-unroll-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/631-checker-get-class/Android.bp b/test/631-checker-get-class/Android.bp index d77ef26bd8..edfd3b1c72 100644 --- a/test/631-checker-get-class/Android.bp +++ b/test/631-checker-get-class/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-631-checker-get-class-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/632-checker-char-at-bounds/Android.bp b/test/632-checker-char-at-bounds/Android.bp index aadc031cc8..34bc0388d6 100644 --- a/test/632-checker-char-at-bounds/Android.bp +++ b/test/632-checker-char-at-bounds/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-632-checker-char-at-bounds-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/635-checker-arm64-volatile-load-cc/Android.bp b/test/635-checker-arm64-volatile-load-cc/Android.bp index cfb9e9d98e..78bee1321d 100644 --- a/test/635-checker-arm64-volatile-load-cc/Android.bp +++ b/test/635-checker-arm64-volatile-load-cc/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-635-checker-arm64-volatile-load-cc-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/637-checker-throw-inline/Android.bp b/test/637-checker-throw-inline/Android.bp index 5ce4c973a8..c8c37e8391 100644 --- a/test/637-checker-throw-inline/Android.bp +++ b/test/637-checker-throw-inline/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-637-checker-throw-inline-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/638-checker-inline-cache-intrinsic/Android.bp b/test/638-checker-inline-cache-intrinsic/Android.bp index b71b75ac02..4236c210a0 100644 --- a/test/638-checker-inline-cache-intrinsic/Android.bp +++ b/test/638-checker-inline-cache-intrinsic/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-638-checker-inline-cache-intrinsic-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/639-checker-code-sinking/Android.bp b/test/639-checker-code-sinking/Android.bp index 6ffbc90b7b..d466919f1a 100644 --- a/test/639-checker-code-sinking/Android.bp +++ b/test/639-checker-code-sinking/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-639-checker-code-sinking-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/640-checker-boolean-simd/Android.bp b/test/640-checker-boolean-simd/Android.bp index f1bd433e8a..3753ed1f2e 100644 --- a/test/640-checker-boolean-simd/Android.bp +++ b/test/640-checker-boolean-simd/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-640-checker-boolean-simd-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/640-checker-integer-valueof/Android.bp b/test/640-checker-integer-valueof/Android.bp index 512cf03c47..c1c79c9a68 100644 --- a/test/640-checker-integer-valueof/Android.bp +++ b/test/640-checker-integer-valueof/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-640-checker-integer-valueof-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/640-checker-simd/Android.bp b/test/640-checker-simd/Android.bp index 2b3ba69237..edb9bfe22c 100644 --- a/test/640-checker-simd/Android.bp +++ b/test/640-checker-simd/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-640-checker-simd-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/641-checker-arraycopy/Android.bp b/test/641-checker-arraycopy/Android.bp index 3988505612..ff4accbfc0 100644 --- a/test/641-checker-arraycopy/Android.bp +++ b/test/641-checker-arraycopy/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-641-checker-arraycopy-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/643-checker-bogus-ic/Android.bp b/test/643-checker-bogus-ic/Android.bp index 8a7d76b1b8..8eb0fbc822 100644 --- a/test/643-checker-bogus-ic/Android.bp +++ b/test/643-checker-bogus-ic/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-643-checker-bogus-ic-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/645-checker-abs-simd/Android.bp b/test/645-checker-abs-simd/Android.bp index cb7e735b38..9f133cd3c7 100644 --- a/test/645-checker-abs-simd/Android.bp +++ b/test/645-checker-abs-simd/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-645-checker-abs-simd-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/646-checker-arraycopy-large-cst-pos/Android.bp b/test/646-checker-arraycopy-large-cst-pos/Android.bp index e9b1ca689a..eb9a325c04 100644 --- a/test/646-checker-arraycopy-large-cst-pos/Android.bp +++ b/test/646-checker-arraycopy-large-cst-pos/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-646-checker-arraycopy-large-cst-pos-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/646-checker-long-const-to-int/Android.bp b/test/646-checker-long-const-to-int/Android.bp index 58fd4d058f..a2b1005681 100644 --- a/test/646-checker-long-const-to-int/Android.bp +++ b/test/646-checker-long-const-to-int/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-646-checker-long-const-to-int-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/646-checker-simd-hadd/Android.bp b/test/646-checker-simd-hadd/Android.bp index 8e2d366b06..7666a54a7f 100644 --- a/test/646-checker-simd-hadd/Android.bp +++ b/test/646-checker-simd-hadd/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-646-checker-simd-hadd-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/650-checker-inline-access-thunks/Android.bp b/test/650-checker-inline-access-thunks/Android.bp index c40bcd944a..803011e90a 100644 --- a/test/650-checker-inline-access-thunks/Android.bp +++ b/test/650-checker-inline-access-thunks/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-650-checker-inline-access-thunks-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/654-checker-periodic/Android.bp b/test/654-checker-periodic/Android.bp index 87fb45865e..2870e71a1a 100644 --- a/test/654-checker-periodic/Android.bp +++ b/test/654-checker-periodic/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-654-checker-periodic-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/655-checker-simd-arm-opt/Android.bp b/test/655-checker-simd-arm-opt/Android.bp index b195fed8b8..d13def18b5 100644 --- a/test/655-checker-simd-arm-opt/Android.bp +++ b/test/655-checker-simd-arm-opt/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-655-checker-simd-arm-opt-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/656-checker-simd-opt/Android.bp b/test/656-checker-simd-opt/Android.bp index d22116a4c7..6bc7410739 100644 --- a/test/656-checker-simd-opt/Android.bp +++ b/test/656-checker-simd-opt/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-656-checker-simd-opt-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/660-checker-sad/Android.bp b/test/660-checker-sad/Android.bp index b73e6ae95e..9e83ea671b 100644 --- a/test/660-checker-sad/Android.bp +++ b/test/660-checker-sad/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-660-checker-sad-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/660-checker-simd-sad/Android.bp b/test/660-checker-simd-sad/Android.bp index 49a5d825f1..629ae97c5a 100644 --- a/test/660-checker-simd-sad/Android.bp +++ b/test/660-checker-simd-sad/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-660-checker-simd-sad-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/661-checker-simd-reduc/Android.bp b/test/661-checker-simd-reduc/Android.bp index 37588ff886..0ad253c509 100644 --- a/test/661-checker-simd-reduc/Android.bp +++ b/test/661-checker-simd-reduc/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-661-checker-simd-reduc-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/665-checker-simd-zero/Android.bp b/test/665-checker-simd-zero/Android.bp index 657db3bc3e..69d7279f0b 100644 --- a/test/665-checker-simd-zero/Android.bp +++ b/test/665-checker-simd-zero/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-665-checker-simd-zero-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/667-checker-simd-alignment/Android.bp b/test/667-checker-simd-alignment/Android.bp index dc9547f811..7b6fc0fafd 100644 --- a/test/667-checker-simd-alignment/Android.bp +++ b/test/667-checker-simd-alignment/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-667-checker-simd-alignment-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/669-checker-break/Android.bp b/test/669-checker-break/Android.bp index 48ab32336e..248cfa8984 100644 --- a/test/669-checker-break/Android.bp +++ b/test/669-checker-break/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-669-checker-break-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/672-checker-throw-method/Android.bp b/test/672-checker-throw-method/Android.bp index e21f27a393..eb5960bf7e 100644 --- a/test/672-checker-throw-method/Android.bp +++ b/test/672-checker-throw-method/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-672-checker-throw-method-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/673-checker-throw-vmethod/Android.bp b/test/673-checker-throw-vmethod/Android.bp index 0fd67e1dff..3785f0703b 100644 --- a/test/673-checker-throw-vmethod/Android.bp +++ b/test/673-checker-throw-vmethod/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-673-checker-throw-vmethod-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/680-checker-deopt-dex-pc-0/Android.bp b/test/680-checker-deopt-dex-pc-0/Android.bp index 3d6562e772..1f0557de16 100644 --- a/test/680-checker-deopt-dex-pc-0/Android.bp +++ b/test/680-checker-deopt-dex-pc-0/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-680-checker-deopt-dex-pc-0-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/684-checker-simd-dotprod/Android.bp b/test/684-checker-simd-dotprod/Android.bp index bea8fb7299..72c4f4fa7d 100644 --- a/test/684-checker-simd-dotprod/Android.bp +++ b/test/684-checker-simd-dotprod/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-684-checker-simd-dotprod-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/697-checker-string-append/Android.bp b/test/697-checker-string-append/Android.bp index 53a79e5a4e..9f79a49ad0 100644 --- a/test/697-checker-string-append/Android.bp +++ b/test/697-checker-string-append/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-697-checker-string-append-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/707-checker-invalid-profile/Android.bp b/test/707-checker-invalid-profile/Android.bp index eddf04dc87..a8cdbb3010 100644 --- a/test/707-checker-invalid-profile/Android.bp +++ b/test/707-checker-invalid-profile/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-707-checker-invalid-profile-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/711-checker-type-conversion/Android.bp b/test/711-checker-type-conversion/Android.bp index f617e974e3..d9dac91d9c 100644 --- a/test/711-checker-type-conversion/Android.bp +++ b/test/711-checker-type-conversion/Android.bp @@ -8,6 +8,9 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":art-run-test-711-checker-type-conversion-expected"], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, } // Test's expected output. diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files index ba175e9ebf..e102422a4f 100755 --- a/test/utils/regen-test-files +++ b/test/utils/regen-test-files @@ -303,8 +303,19 @@ while read run_test; do # Ignore tests with Hidden API specs. [[ -f "$tests_dir/$run_test/hiddenapi-flags.csv" ]] && continue + run_test_name="art-run-test-$run_test" - cat >"$bp_file" <<EOF + + if [[ "$run_test" =~ ^[0-9]+-checker- ]]; then + include_src=" // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, +" + else + include_src="" + fi + + cat >"$bp_file" <<EOF // Generated by \`$me\`. Do not edit manually. // Build rules for ART run-test \`$run_test\`. @@ -315,7 +326,7 @@ java_test { defaults: ["art-run-test-defaults"], srcs: ["src/**/*.java"], data: [":$run_test_name-expected"], -} +$include_src} // Test's expected output. genrule { @@ -325,6 +336,7 @@ genrule { cmd: "cp -f \$(in) \$(out)", } EOF + # Record test name. handled_tests+=("$run_test_name") done <<< $(ls -1 $tests_dir | grep -E '^[0-9]{3,}-') |