Skip to content

Commit e64066d

Browse files
iirinacopybara-github
authored andcommitted
Enable --incompatible_java_coverage by default in Bazel.
Fixes #7425 RELNOTES: `--incompatible_java_coverage` is enabled by default. Closes #7426. PiperOrigin-RevId: 235914032
1 parent 3921d6f commit e64066d

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ public static class Options extends FragmentOptions implements Cloneable {
589589

590590
@Option(
591591
name = "incompatible_java_coverage",
592-
defaultValue = "false",
592+
defaultValue = "true",
593593
documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS,
594594
effectTags = {OptionEffectTag.AFFECTS_OUTPUTS},
595595
metadataTags = {

src/test/shell/bazel/bazel_coverage_java_test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ EOF
113113
local coverage_file_path="$( get_coverage_file_path_from_test_log )"
114114

115115
cat <<EOF > result.dat
116-
SF:com/example/Collatz.java
116+
SF:src/main/com/example/Collatz.java
117117
FN:3,com/example/Collatz::<init> ()V
118118
FN:6,com/example/Collatz::getCollatzFinal (I)I
119119
FNDA:0,com/example/Collatz::<init> ()V
@@ -201,7 +201,7 @@ EOF
201201
|| echo "Coverage for //:test failed"
202202

203203
cat <<EOF > result.dat
204-
SF:com/example/Collatz.java
204+
SF:src/main/com/example/Collatz.java
205205
FN:3,com/example/Collatz::<init> ()V
206206
FN:6,com/example/Collatz::getCollatzFinal (I)I
207207
FNDA:0,com/example/Collatz::<init> ()V

src/test/shell/bazel/bazel_coverage_sh_test.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ EOF
132132
local coverage_file_path="$( get_coverage_file_path_from_test_log )"
133133

134134
cat <<EOF > result.dat
135-
SF:com/google/orange/orangeBin.java
135+
SF:java/com/google/orange/orangeBin.java
136136
FN:3,com/google/orange/orangeBin::<init> ()V
137137
FN:5,com/google/orange/orangeBin::main ([Ljava/lang/String;)V
138138
FNDA:0,com/google/orange/orangeBin::<init> ()V
@@ -146,7 +146,7 @@ DA:7,1
146146
LH:3
147147
LF:4
148148
end_of_record
149-
SF:com/google/orange/orangeLib.java
149+
SF:java/com/google/orange/orangeLib.java
150150
FN:3,com/google/orange/orangeLib::<init> ()V
151151
FN:6,com/google/orange/orangeLib::print ()V
152152
FNDA:1,com/google/orange/orangeLib::<init> ()V
@@ -501,7 +501,7 @@ end_of_record"
501501

502502
############# Assert Java code coverage results
503503

504-
local coverage_result_orange_bin="SF:com/google/orange/orangeBin.java
504+
local coverage_result_orange_bin="SF:java/com/google/orange/orangeBin.java
505505
FN:2,com/google/orange/orangeBin::<init> ()V
506506
FN:4,com/google/orange/orangeBin::main ([Ljava/lang/String;)V
507507
FNDA:0,com/google/orange/orangeBin::<init> ()V
@@ -517,7 +517,7 @@ LF:4
517517
end_of_record"
518518
assert_coverage_result "$coverage_result_orange_bin" "$coverage_file_path"
519519

520-
local coverage_result_orange_lib="SF:com/google/orange/orangeLib.java
520+
local coverage_result_orange_lib="SF:java/com/google/orange/orangeLib.java
521521
FN:2,com/google/orange/orangeLib::<init> ()V
522522
FN:4,com/google/orange/orangeLib::print ()V
523523
FNDA:1,com/google/orange/orangeLib::<init> ()V

tools/jdk/BUILD

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,11 @@ java_import(
220220
jars = ["@remote_java_tools//:java_tools/JacocoCoverage_jarjar_deploy.jar"],
221221
)
222222

223+
java_import(
224+
name = "JacocoCoverage",
225+
jars = ["@remote_java_tools//:java_tools/JacocoCoverage_jarjar_deploy.jar"],
226+
)
227+
223228
java_import(
224229
name = "TestRunner",
225230
jars = ["@remote_java_tools//:java_tools/Runner_deploy.jar"],

0 commit comments

Comments
 (0)