Use freshly built allmodules JDK for the jdeps test.
Otherwise we have a cliff every time we bump the embedded JDK version.
Next step of #6592.
RELNOTES: None
Closes #7326.
PiperOrigin-RevId: 231997465
diff --git a/src/BUILD b/src/BUILD
index 4e939a1..c7a035079 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -284,6 +284,7 @@
":embedded_jdk_allmodules.tar.gz",
],
}),
+ visibility = ["//src/test/shell/bazel:__pkg__"],
)
[genrule(
diff --git a/src/jdeps_modules.golden b/src/jdeps_modules.golden
index e130d13..c1d235a 100644
--- a/src/jdeps_modules.golden
+++ b/src/jdeps_modules.golden
@@ -1,4 +1,3 @@
-java.activation
java.base
java.compiler
java.desktop
@@ -9,7 +8,6 @@
java.security.jgss
java.sql
java.xml
-java.xml.bind
jdk.compiler
jdk.management
jdk.sctp
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index e4b1cc6..04ba5b5 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD
@@ -783,7 +783,7 @@
data = [
":jdeps_class_blacklist.txt",
":test-deps",
- "//src:embedded_jdk_allmodules_cached",
+ "//src:embedded_jdk_allmodules",
"//src:jdeps_modules.golden",
"//src/main/java/com/google/devtools/build/lib:bazel/BazelServer_deploy.jar",
"@bazel_tools//tools/bash/runfiles",
diff --git a/src/test/shell/bazel/jdeps_test.sh b/src/test/shell/bazel/jdeps_test.sh
index 90dc697..1277bf5 100755
--- a/src/test/shell/bazel/jdeps_test.sh
+++ b/src/test/shell/bazel/jdeps_test.sh
@@ -59,9 +59,8 @@
else
platform="linux"
fi
- cp $(rlocation openjdk_${platform}/file/zulu-${platform}.tar.gz) .
- tar xf zulu-${platform}.tar.gz || fail "Failed to extract JDK."
- find . | grep jdeps
+ cp $(rlocation io_bazel/src/allmodules_jdk.tar.gz) .
+ tar xf allmodules_jdk.tar.gz || fail "Failed to extract JDK."
blacklist=$(rlocation io_bazel/src/test/shell/bazel/jdeps_class_blacklist.txt)
deploy_jar=$(rlocation io_bazel/src/main/java/com/google/devtools/build/lib/bazel/BazelServer_deploy.jar)
cd ../bazeljar
@@ -73,7 +72,7 @@
# src/test/shell/bazel/jdeps_class_blacklist.txt.
find . -type f -iname \*class | \
grep -vFf "$blacklist" | \
- xargs ../jdk/zulu9.0.7.1-jdk9.0.7-*/bin/jdeps --list-reduced-deps | \
+ xargs ../jdk/reduced/bin/jdeps --list-reduced-deps | \
grep -v "unnamed module" > ../jdeps \
|| fail "Failed to run jdeps on non blacklisted class files."
cd ..
