Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reenable jacocoagent test. #12409

Closed
wants to merge 1 commit into from
Closed

Reenable jacocoagent test. #12409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions src/test/shell/bazel/bazel_java_tools_test.sh
View file
Open in desktop
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
View file
Open in desktop
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