File tree 3 files changed +12
-2
lines changed 3 files changed +12
-2
lines changed Original file line number Diff line number Diff line change @@ -99,6 +99,8 @@ function get_coverage_file_path_from_test_log() {
99
99
100
100
function test_java_test_coverage() {
101
101
cat << EOF > BUILD
102
+ load("//tools/jdk:default_java_toolchain.bzl", "default_java_toolchain")
103
+
102
104
java_test(
103
105
name = "test",
104
106
srcs = glob(["src/test/**/*.java"]),
@@ -110,6 +112,10 @@ java_library(
110
112
name = "collatz-lib",
111
113
srcs = glob(["src/main/**/*.java"]),
112
114
)
115
+
116
+ default_java_toolchain(
117
+ name = "custom_toolchain"
118
+ )
113
119
EOF
114
120
115
121
mkdir -p src/main/com/example
@@ -179,7 +185,10 @@ LH:5
179
185
LF:6
180
186
end_of_record"
181
187
182
- assert_coverage_result " $expected_result " " $coverage_file_path "
188
+ assert_coverage_result " $expected_result " " $coverage_file_path "
189
+
190
+ bazel coverage --test_output=all --java_toolchain=//:custom_toolchain //:test & > $TEST_log || fail " Coverage with default_java_toolchain for //:test failed"
191
+ assert_coverage_result " $expected_result " " $coverage_file_path "
183
192
}
184
193
185
194
function test_java_test_coverage_combined_report() {
Original file line number Diff line number Diff line change @@ -271,7 +271,7 @@ remote_java_tools_java_import(
271
271
target = ":java_tools/JacocoCoverage_jarjar_deploy.jar" ,
272
272
)
273
273
274
- remote_java_tools_java_import (
274
+ remote_java_tools_filegroup (
275
275
name = "JacocoCoverage" ,
276
276
target = ":java_tools/JacocoCoverage_jarjar_deploy.jar" ,
277
277
)
Original file line number Diff line number Diff line change @@ -56,6 +56,7 @@ DEFAULT_TOOLCHAIN_CONFIGURATION = {
56
56
"header_compiler_direct" : ["@bazel_tools//tools/jdk:turbine_direct" ],
57
57
"ijar" : ["@bazel_tools//tools/jdk:ijar" ],
58
58
"javabuilder" : ["@bazel_tools//tools/jdk:javabuilder" ],
59
+ "jacocorunner" : "@bazel_tools//tools/jdk:JacocoCoverage" ,
59
60
"tools" : [
60
61
"@bazel_tools//tools/jdk:javac_jar" ,
61
62
"@bazel_tools//tools/jdk:java_compiler_jar" ,
You can’t perform that action at this time.
0 commit comments