From be3c3dfd7aeaebdaea960983dfc2c47b86e896e1 Mon Sep 17 00:00:00 2001 From: Ivo List Date: Mon, 11 Jan 2021 10:49:17 +0000 Subject: [PATCH] Test coverage support when using default_java_toolchain. Issue https://github.com/bazelbuild/bazel/issues/12793 --- src/test/shell/bazel/bazel_coverage_java_test.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/test/shell/bazel/bazel_coverage_java_test.sh b/src/test/shell/bazel/bazel_coverage_java_test.sh index 735b943271b3d2..345956710821de 100755 --- a/src/test/shell/bazel/bazel_coverage_java_test.sh +++ b/src/test/shell/bazel/bazel_coverage_java_test.sh @@ -118,6 +118,8 @@ function get_coverage_file_path_from_test_log() { function test_java_test_coverage() { cat < BUILD +load("//tools/jdk:default_java_toolchain.bzl", "default_java_toolchain") + java_test( name = "test", srcs = glob(["src/test/**/*.java"]), @@ -129,6 +131,10 @@ java_library( name = "collatz-lib", srcs = glob(["src/main/**/*.java"]), ) + +default_java_toolchain( + name = "custom_toolchain" +) EOF mkdir -p src/main/com/example @@ -198,7 +204,10 @@ LH:5 LF:6 end_of_record" -assert_coverage_result "$expected_result" "$coverage_file_path" + assert_coverage_result "$expected_result" "$coverage_file_path" + + bazel coverage --test_output=all --java_toolchain=//:custom_toolchain //:test &>$TEST_log || fail "Coverage with default_java_toolchain for //:test failed" + assert_coverage_result "$expected_result" "$coverage_file_path" } function test_java_test_coverage_combined_report() {