commit 4b53e8f045ac4def841a66483bbac7ef9ed625bf
author Loo Rong Jie <loorongjie@gmail.com> Fri Nov 02 09:24:43 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Fri Nov 02 09:26:56 2018 -0700
tree 4315430d0f7702a63d09f3137e0d2b7843b5a8e5
parent f445af588e3f35464db73b880a2efbc39d0cebc6

[singlejar] Use Bazel runfiles lib in test and other Windows fixes

See #2241

Closes #6251.

PiperOrigin-RevId: 219810346

src/tools/singlejar/BUILD

diff --git a/src/tools/singlejar/BUILD b/src/tools/singlejar/BUILD
index 8d5a7f8..0c7dc46 100644
--- a/src/tools/singlejar/BUILD
+++ b/src/tools/singlejar/BUILD
@@ -97,7 +97,8 @@
         ":zlib_interface",
     ],
     tags = [
-        # https://github.com/bazelbuild/bazel/issues/6512
+        # TODO(laszlocsomor) Enable this test when BuildKite uses Bazel that includes
+        # https://github.com/bazelbuild/bazel/commit/914b4ce14624171a97ff8b41f9202058f10d15b2
         "no_windows",
     ],
     deps = [
@@ -117,11 +118,6 @@
     data = [
         "data/empty.zip",
     ],
-    tags = [
-        # TODO(@rongjiecomputer): make this work on Windows as part of
-        # https://github.com/bazelbuild/bazel/issues/2241
-        "no_windows",
-    ],
     deps = [
         ":input_jar",
         ":test_util",
@@ -132,17 +128,13 @@
 
 cc_test(
     name = "input_jar_preambled_test",
+    size = "large",
     srcs = [
         "input_jar_preambled_test.cc",
     ],
     data = [
         ":test1",
     ],
-    tags = [
-        # TODO(@rongjiecomputer): make this work on Windows as part of
-        # https://github.com/bazelbuild/bazel/issues/2241
-        "no_windows",
-    ],
     deps = [
         ":input_jar",
         ":test_util",
@@ -158,7 +150,10 @@
         "input_jar_scan_entries_test.h",
         "input_jar_scan_jartool_test.cc",
     ],
-    copts = ["-DJAR_TOOL_PATH=\\\"$(JAVABASE)/bin/jar\\\""],
+    copts = select({
+        "//src/conditions:windows": ["-DJAR_TOOL_PATH=\\\"io_bazel/$(JAVABASE)/bin/jar.exe\\\""],
+        "//conditions:default": ["-DJAR_TOOL_PATH=\\\"io_bazel/$(JAVABASE)/bin/jar\\\""],
+    }),
     data = ["@bazel_tools//tools/jdk:current_java_runtime"],
     # Timing out, see https://github.com/bazelbuild/bazel/issues/1555
     tags = ["manual"],
@@ -228,9 +223,10 @@
     srcs = [
         "output_jar_simple_test.cc",
     ],
-    # TODO(@rongjiecomputer): update copts to handle Windows and add
-    # ".exe" extension.
-    copts = ["-DJAR_TOOL_PATH=\\\"$(JAVABASE)/bin/jar\\\""],
+    copts = select({
+        "//src/conditions:windows": ["-DJAR_TOOL_PATH=\\\"io_bazel/$(JAVABASE)/bin/jar.exe\\\""],
+        "//conditions:default": ["-DJAR_TOOL_PATH=\\\"io_bazel/$(JAVABASE)/bin/jar\\\""],
+    }),
     data = [
         ":data1",
         ":data2",
@@ -239,11 +235,6 @@
         ":test2",
         "@bazel_tools//tools/jdk:current_java_runtime",
     ],
-    tags = [
-        # TODO(@rongjiecomputer): make this work on Windows as part of
-        # https://github.com/bazelbuild/bazel/issues/2241
-        "no_windows",
-    ],
     toolchains = ["@bazel_tools//tools/jdk:current_java_runtime"],
     deps = [
         ":input_jar",