fix zip64_test to work with absolute $(JAVABASE)

Tested with an absolute $(JAVABASE) and --(no)legacy_external_runfiles. Progress towards bazelbuild#8033
buchgr · Apr 15, 2019 · 88c4e7b · 88c4e7b
1 parent 6f90d01
commit 88c4e7b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/tools/singlejar/BUILD b/src/tools/singlejar/BUILD
@@ -327,6 +327,7 @@ cc_test(
 sh_test(
     name = "zip64_test",
     srcs = ["zip64_test.sh"],
+    args = ["$(JAVABASE)"],
     data = [
         ":singlejar",
         "//src/test/shell:bashunit",

diff --git a/src/tools/singlejar/zip64_test.sh b/src/tools/singlejar/zip64_test.sh
@@ -53,7 +53,15 @@ else
 fi
 
 singlejar="$(rlocation "io_bazel/src/tools/singlejar/singlejar${EXE_EXT}")"
-jartool="$(rlocation "local_jdk/bin/jar${EXE_EXT}")"
+javabase="$1"
+if [[ $javabase = /* ]]; then
+  jartool="$1/bin/jar${EXE_EXT}"
+else
+  if [[ $javabase = external/* ]]; then
+    javabase=${javabase#"external/"}
+  fi
+  jartool="$(rlocation "${javabase}/bin/jar${EXE_EXT}")"
+fi
 
 # Test that an archive with >64K entries can be created.
 function test_65Kentries() {