diff options
| author |  Vladimir Moskva <vladmos@google.com> | 2017-01-16 14:40:02 +0000 |
|---|---|---|
| committer | Vladimir Moskva <vladmos@google.com> | 2017-01-16 14:41:50 +0000 |
| commit | 7f064ea73cd07e840d696a42b1aaf6450a810d87 (patch) | |
| tree | 405cf2ca2d03f7087a97eafbd98dac07484fcf75 /src/java_tools | |
| parent | 106f9e95c3d88209c5f1873b9718dc63ca1ad6f3 (diff) | |
Rollback of commit 56328986232dfe4d92f738ab3bbd26d89236a428.
*** Reason for rollback ***
Breaks Bazel build for Windows using Java 1.8
http://ci.bazel.io/view/Bazel%20bootstrap%20and%20maintenance/job/Bazel/JAVA_VERSION=1.8,PLATFORM_NAME=windows-x86_64/1188/
*** Original change description ***
Jarjar the third-party dependencies of the Jacoco test runner.
This is the second encore of commit 823091f7516abf7d854021edc765daf1467f1647. The first one failed because jarjar tried to write to C:\WINDOWS , the second one failed because cygpath doesn't work for some reason on our CI machines and I hope that the "jarjar_bin cannot found" error message was only a fluke.
Otherwise, this'll be fixed online.
--
PiperOrigin-RevId: 144630946
MOS_MIGRATED_REVID=144630946
Diffstat (limited to 'src/java_tools')
| -rw-r--r-- | src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD | 33 | ||||
| -rw-r--r-- | src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoCoverage.jarjar | 2 |
2 files changed, 1 insertions, 34 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 89fc2fc5c3..319f13b6d2 100644 --- a/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD +++ b/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD @@ -22,7 +22,7 @@ filegroup( filegroup( name = "embedded_tools", srcs = [ - "JacocoCoverage_jarjar_deploy.jar", + "JacocoCoverage_deploy.jar", ], ) @@ -68,34 +68,3 @@ java_library( "//third_party:apache_commons_lang", ], ) - -genrule( - name = "Jacoco_jarjar", - srcs = [ - ":JacocoCoverage_deploy.jar", - ":JacocoCoverage.jarjar", - ], - outs = ["JacocoCoverage_jarjar_deploy.jar"], - cmd = "\n".join([ - # File#createTempFile() apparently tries to create the temp file under - # C:\WINDOWS by default on Windows, which is not writable. Help Java a bit. - # https://github.com/bazelbuild/bazel/issues/2349 will be a general - # solution for creating temp files in Java binaries in actions. Once - # that's fixed, we won't need to set TEMP here anymore. - "set +e", - "if [[ $$(uname -a) =~ MSYS ]]; then", - " DOS_TEMP=\"$$(cygpath -m --mydocs)/temp\";", - " PATH_DOS=$$?;", - " UNIX_TEMP=\"$$(cygpath -u --mydocs)/temp\";", - " if [[ $$? != 0 || $$PATH_DOS != 0 ]]; then", - " echo Cannot find temp directory, defaulting to /c/temp;", - " export DOS_TEMP=C:\\\\TEMP;", - " UNIX_TEMP=/c/temp;", - " fi", - " export TEMP=\"$$DOS_TEMP\";", - " mkdir -p \"$$UNIX_TEMP\";", - "fi", - "\"$(location //third_party/java/jarjar:jarjar_bin)\" process \"$(location :JacocoCoverage.jarjar)\" \"$(location :JacocoCoverage_deploy.jar)\" \"$@\"", - ]), - tools = ["//third_party/java/jarjar:jarjar_bin"], -) diff --git a/src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoCoverage.jarjar b/src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoCoverage.jarjar deleted file mode 100644 index 56190d874c..0000000000 --- a/src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoCoverage.jarjar +++ /dev/null @@ -1,2 +0,0 @@ -rule org.apache.commons.** com.google.testing.coverage.jarjar.@0 -rule org.objectweb.asm.** com.google.testing.coverage.jarjar.@0 |