Add test and address reviewr comments

bazelbuild · Jul 22, 2019 · 5fc3588 · 5fc3588
1 parent efa07a8
commit 5fc3588
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/src/test/shell/bazel/bazel_java_tools_test.sh b/src/test/shell/bazel/bazel_java_tools_test.sh
@@ -189,4 +189,36 @@ EOF
   bazel build @local_java_tools//:toolchain || fail "toolchain failed to build"
 }
 
+function test_java_tools_singlejar_builds() {
+  local java_tools_rlocation=$(rlocation io_bazel/src/java_tools_${JAVA_TOOLS_JAVA_VERSION}.zip)
+  local java_tools_zip_file_url="file://${java_tools_rlocation}"
+  if "$is_windows"; then
+        java_tools_zip_file_url="file:///${java_tools_rlocation}"
+  fi
+  cat >WORKSPACE <<EOF
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+http_archive(
+    name = "local_java_tools",
+    urls = ["${java_tools_zip_file_url}"]
+)
+EOF
+  bazel build @local_java_tools//:singlejar_cc_bin || fail "singlejar failed to build"
+}
+
+ function test_java_tools_ijar_builds() {
+  local java_tools_rlocation=$(rlocation io_bazel/src/java_tools_${JAVA_TOOLS_JAVA_VERSION}.zip)
+  local java_tools_zip_file_url="file://${java_tools_rlocation}"
+  if "$is_windows"; then
+        java_tools_zip_file_url="file:///${java_tools_rlocation}"
+  fi
+  cat >WORKSPACE <<EOF
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+http_archive(
+name = "local_java_tools",
+    urls = ["${java_tools_zip_file_url}"]
+)
+EOF
+  bazel build @local_java_tools//:ijar_cc_binary || fail "ijar failed to build"
+}
+
 run_suite "Java tools archive tests"
diff --git a/third_party/ijar/BUILD b/third_party/ijar/BUILD
@@ -30,7 +30,11 @@ cc_library(
         "//src:__subpackages__",
         "//third_party/ijar:__subpackages__",
         "//tools/test:__pkg__",
+        # TODO(bazel-team): Move this target out of @bazel_tools
         "@local_java_tools//:__pkg__",
+        "@remote_java_tools_linux//:__pkg__",
+        "@remote_java_tools_darwin//:__pkg__",
+        "@remote_java_tools_windows//:__pkg__",
     ],
     deps = [
         ":platform_utils",