Skip to content

Commit

Permalink
Reenable jacocoagent test.
Browse files Browse the repository at this point in the history
Found an old TODO in the code (misspelled TOODO), reenabled the test, fixed versions.

Closes bazelbuild#12409.

PiperOrigin-RevId: 340633919
  • Loading branch information
comius authored and copybara-github committed Nov 4, 2020
1 parent 1db3a70 commit 7cc8577
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 15 deletions.
17 changes: 8 additions & 9 deletions src/test/shell/bazel/bazel_java_tools_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,14 @@ function test_java_tools_has_BUILD() {
expect_path_in_java_tools "BUILD"
}

# TOODO(iirina): Re-enable this and update jacoco version after #8376 is merged.
function DISABLED_test_java_tools_has_jacocoagent() {
expect_path_in_java_tools "java_tools/third_party/java/jacoco/jacocoagent.jar"
expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.agent-0.7.5.201505241946.jar"
expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.core-0.7.5.201505241946.jar"
expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.report-0.7.5.201505241946.jar"
expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-tree-7.0.jar"
expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-commons-7.0.jar"
expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-7.0.jar"
function test_java_tools_has_jacocoagent() {
expect_path_in_java_tools "java_tools/third_party/java/jacoco/jacocoagent-0.8.3.jar"
expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.agent-0.8.3.jar"
expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.core-0.8.3.jar"
expect_path_in_java_tools "java_tools/third_party/java/jacoco/org.jacoco.report-0.8.3.jar"
expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-tree-8.0.jar"
expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-commons-8.0.jar"
expect_path_in_java_tools "java_tools/third_party/java/jacoco/asm-8.0.jar"
expect_path_in_java_tools "java_tools/third_party/java/jacoco/LICENSE"
}

Expand Down
12 changes: 6 additions & 6 deletions tools/jdk/BUILD.java_tools
Original file line number Diff line number Diff line change
Expand Up @@ -301,21 +301,21 @@ java_import(

java_import(
name = "asm",
jars = ["java_tools/third_party/java/jacoco/asm-7.0.jar"],
srcjar = "java_tools/third_party/java/jacoco/asm-7.0-sources.jar",
jars = ["java_tools/third_party/java/jacoco/asm-8.0.jar"],
srcjar = "java_tools/third_party/java/jacoco/asm-8.0-sources.jar",
)

java_import(
name = "asm-commons",
jars = ["java_tools/third_party/java/jacoco/asm-commons-7.0.jar"],
srcjar = "java_tools/third_party/java/jacoco/asm-commons-7.0-sources.jar",
jars = ["java_tools/third_party/java/jacoco/asm-commons-8.0.jar"],
srcjar = "java_tools/third_party/java/jacoco/asm-commons-8.0-sources.jar",
runtime_deps = [":asm-tree"],
)

java_import(
name = "asm-tree",
jars = ["java_tools/third_party/java/jacoco/asm-tree-7.0.jar"],
srcjar = "java_tools/third_party/java/jacoco/asm-tree-7.0-sources.jar",
jars = ["java_tools/third_party/java/jacoco/asm-tree-8.0.jar"],
srcjar = "java_tools/third_party/java/jacoco/asm-tree-8.0-sources.jar",
runtime_deps = [":asm"],
)

Expand Down

0 comments on commit 7cc8577

Please sign in to comment.