From 3a5d3db6436bbaf5351da9ea9c19a41ae7c95ca9 Mon Sep 17 00:00:00 2001
From: lberki <lberki@google.com>
Date: Tue, 18 Apr 2017 16:37:35 +0200
Subject: [PATCH] Re-enable the Java coverage tests.

It has been disabled in https://github.com/bazelbuild/bazel/commit/bce889840f91f14c05418d960984bcf1a5f59411 and in https://github.com/bazelbuild/bazel/commit/21fb8cac60c36cb527d6131ab0092bcdf138d99a and then was not re-enabled.

Also update src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD to which I accidentally submitted a change directly to our OSS repository.

RELNOTES: None.
PiperOrigin-RevId: 153460778
---
 .../java/com/google/testing/coverage/BUILD          |  4 ++--
 src/test/shell/bazel/bazel_coverage_test.sh         | 13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD b/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
index d4d7508c94ebbf..1714f62434776b 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
@@ -105,11 +105,11 @@ genrule(
         "if [[ $$(uname -a) =~ MSYS ]] || [[ $$(uname -a) =~ CYGWIN ]] || [[ $$(uname -a) =~ freebsd ]]; then",
         "  cp \"$(location :JacocoCoverage_deploy.jar)\" \"$@\";",
         "else",
-        "  \"$(JAVA)\" -jar \"$(location //third_party/java/jarjar:jarjar_bin_deploy.jar)\" process \"$(location :JacocoCoverage.jarjar)\" \"$(location :JacocoCoverage_deploy.jar)\" \"$@\"",
+        "  \"$(JAVA)\" -jar \"$(location //third_party/java/jarjar:jarjar_command_deploy.jar)\" --rules \"$(location :JacocoCoverage.jarjar)\" --output \"$@\" \"$(location :JacocoCoverage_deploy.jar)\"",
         "fi",
     ]),
     tools = [
-        "//third_party/java/jarjar:jarjar_bin_deploy.jar",
+        "//third_party/java/jarjar:jarjar_command_deploy.jar",
         "//tools/defaults:jdk",
     ],
 )
diff --git a/src/test/shell/bazel/bazel_coverage_test.sh b/src/test/shell/bazel/bazel_coverage_test.sh
index 4b271ca6478ba6..c8cbb038fc1f81 100755
--- a/src/test/shell/bazel/bazel_coverage_test.sh
+++ b/src/test/shell/bazel/bazel_coverage_test.sh
@@ -79,8 +79,18 @@ EOF
 
   bazel coverage //:test &>$TEST_log || fail "Coverage for //:test failed"
 
+  echo ================ TL ======================
+  cat $TEST_log
+  echo ================ TL END ==================
+
   ending_part=$(sed -n -e '/PASSED/,$p' $TEST_log)
+
+  echo ====== EP ======
+  echo "$ending_part"
+  echo ====== END EP ======
+
   coverage_file_path=$(grep -Eo "/[/a-zA-Z0-9\.\_\-]+\.dat$" <<< "$ending_part")
+  echo ========= CFP "$coverage_file_path"
   [ -e $coverage_file_path ] || fail "Coverage output file not exists!"
 
   cat <<EOF > result.dat
@@ -107,5 +117,4 @@ EOF
   fi
 }
 
-# TODO(#2227): Re-enable when the jacoco processor issue is fixed.
-#run_suite "test tests"
+run_suite "test tests"