Reenable import_deps_checker tests in Bazel

A compatible JDK 8 is fetched via `remote_java_repository`. Requires fixing paths in golden files to not contain `third_party/bazel/` as well as the expected exit code of the `MethodHandle#invoke` test, which is expected to pass. Fixes #8162 Closes #20655. PiperOrigin-RevId: 602641568 Change-Id: I54ec568d981e3bd27caab9e24c0c9eb2a25c6372
bazelbuild · Feb 21, 2024 · 70452ff · 70452ff
1 parent dfe70fa
commit 70452ff
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 53 deletions.
diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
@@ -37,9 +37,6 @@ tasks:
       - "//tools/compliance/..."
       - "//tools/python/..."
       - "//tools/bash/..."
-      # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
-      - "-//src/java_tools/buildjar/..."
-      - "-//src/java_tools/import_deps_checker/..."
       # These tests are not compatible with the gcov version of CentOS 7.
       - "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
       - "-//src/test/shell/bazel:bazel_coverage_cc_released_test_gcc"
@@ -99,7 +96,6 @@ tasks:
       - "//tools/python/..."
       - "//tools/bash/..."
       # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
-      - "-//src/java_tools/import_deps_checker/..."
     include_json_profile:
       - build
       - test
@@ -158,8 +154,6 @@ tasks:
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
-      # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
-      - "-//src/java_tools/import_deps_checker/..."
     include_json_profile:
       - build
       - test
@@ -194,9 +188,6 @@ tasks:
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
-      # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
-      - "-//src/java_tools/buildjar/..."
-      - "-//src/java_tools/import_deps_checker/..."
       # C++ coverage is not supported on macOS yet.
       - "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
       # MacOS does not have cgroups so it can't support hardened sandbox
@@ -255,9 +246,6 @@ tasks:
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
-      # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
-      - "-//src/java_tools/buildjar/..."
-      - "-//src/java_tools/import_deps_checker/..."
       # C++ coverage is not supported on macOS yet.
       - "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
       # MacOS does not have cgroups so it can't support hardened sandbox
@@ -402,9 +390,6 @@ tasks:
       - "-//src/test/shell/bazel:bazel_repository_cache_test"
       - "-//src/test/shell/integration:java_integration_test"
       - "-//src/test/java/com/google/devtools/build/lib/sandbox/..."
-      # See https://github.com/bazelbuild/bazel/issues/8162 (also disabled for local exec)
-      - "-//src/java_tools/buildjar/..."
-      - "-//src/java_tools/import_deps_checker/..."
       # We hit connection timeout error when downloading multiple URLs on RBE, see b/217865760
       - "-//src/test/py/bazel:bazel_module_test"
       - "-//src/test/py/bazel:bazel_lockfile_test"

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -38,9 +38,6 @@ tasks:
       - "//tools/compliance/..."
       - "//tools/python/..."
       - "//tools/bash/..."
-      # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
-      - "-//src/java_tools/buildjar/..."
-      - "-//src/java_tools/import_deps_checker/..."
       # These tests are not compatible with the gcov version of CentOS 7.
       - "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
       - "-//src/test/shell/bazel:bazel_coverage_cc_released_test_gcc"
@@ -100,8 +97,6 @@ tasks:
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
-      # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
-      - "-//src/java_tools/import_deps_checker/..."
     include_json_profile:
       - build
       - test
@@ -161,8 +156,6 @@ tasks:
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
-      # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
-      - "-//src/java_tools/import_deps_checker/..."
     include_json_profile:
       - build
       - test
@@ -198,9 +191,6 @@ tasks:
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
-      # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
-      - "-//src/java_tools/buildjar/..."
-      - "-//src/java_tools/import_deps_checker/..."
       # C++ coverage is not supported on macOS yet.
       - "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
       # MacOS does not have cgroups so it can't support hardened sandbox
@@ -260,9 +250,6 @@ tasks:
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
-      # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
-      - "-//src/java_tools/buildjar/..."
-      - "-//src/java_tools/import_deps_checker/..."
       # C++ coverage is not supported on macOS yet.
       - "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
       # MacOS does not have cgroups so it can't support hardened sandbox
@@ -463,9 +450,6 @@ tasks:
       - "-//src/test/shell/bazel:bazel_repository_cache_test"
       - "-//src/test/shell/integration:java_integration_test"
       - "-//src/test/java/com/google/devtools/build/lib/sandbox/..."
-      # See https://github.com/bazelbuild/bazel/issues/8162 (also disabled for local exec)
-      - "-//src/java_tools/buildjar/..."
-      - "-//src/java_tools/import_deps_checker/..."
       # We hit connection timeout error when downloading multiple URLs on RBE, see b/217865760
       - "-//src/test/py/bazel:bazel_module_test"
       - "-//src/test/py/bazel:bazel_lockfile_test"

diff --git a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/BUILD b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/BUILD
@@ -61,10 +61,10 @@ java_test(
         "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_lib_LibraryInterface",
         "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_lib_LibraryModuleInfo",
         "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_lib_Library_no_members",
-        "@local_jdk//:jre/lib/rt.jar",
+        "@bazel_tools//tools/jdk:platformclasspath",
     ],
     jvm_flags = [
-        "-Dclasscache.test.bootclasspath=$(location @local_jdk//:jre/lib/rt.jar)",
+        "-Dclasscache.test.bootclasspath=$(location @bazel_tools//tools/jdk:platformclasspath)",
         "-Dclasscache.test.Client=$(location //src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_client)",
         "-Dclasscache.test.Library=$(location //src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_lib_Library)",
         "-Dclasscache.test.Library_no_members=$(location //src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_lib_Library_no_members)",
@@ -96,10 +96,10 @@ java_test(
         "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_lib_LibraryInterface",
         "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_lib_LibraryModuleInfo",
         "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_lib_Library_no_members",
-        "@local_jdk//:jre/lib/rt.jar",
+        "@bazel_tools//tools/jdk:platformclasspath",
     ],
     jvm_flags = [
-        "-Dclasscache.test.bootclasspath=$(location @local_jdk//:jre/lib/rt.jar)",
+        "-Dclasscache.test.bootclasspath=$(location @bazel_tools//tools/jdk:platformclasspath)",
         "-Dclasscache.test.Client=$(location //src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_client)",
         "-Dclasscache.test.Library=$(location //src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_lib_Library)",
         "-Dclasscache.test.Library_no_members=$(location //src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:testdata_lib_Library_no_members)",
@@ -115,7 +115,6 @@ java_test(
         "//third_party:guava",
         "//third_party:junit4",
         "//third_party:truth",
-        "@local_jdk//:jre/lib/rt.jar",
     ],
 )
 
@@ -129,7 +128,7 @@ create_golden_test(
     has_bootclasspath = False,
     import_deps_checker = "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker",
     missing_jar = None,
-    rt_jar = "@local_jdk//:jre/lib/rt.jar",
+    rt_jar = "@bazel_tools//tools/jdk:platformclasspath",
     testdata_pkg = "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata",
 )
 
@@ -143,20 +142,20 @@ create_golden_test(
     has_bootclasspath = False,
     import_deps_checker = "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker",
     missing_jar = None,
-    rt_jar = "@local_jdk//:jre/lib/rt.jar",
+    rt_jar = "@bazel_tools//tools/jdk:platformclasspath",
     testdata_pkg = "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata",
 )
 
 create_golden_test(
     name = "silent_on_bootclasspath_missing_golden_test",
     checking_mode = "silence",
     expect_errors = False,
-    golden_output_file = "golden_complete_classpath.txt",
+    golden_output_file = "golden_silent_on_bootclasspath_missing_golden_test.txt",
     golden_stderr_file = "golden_complete_classpath.stderr.txt",
     has_bootclasspath = False,
     import_deps_checker = "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker",
     missing_jar = None,
-    rt_jar = "@local_jdk//:jre/lib/rt.jar",
+    rt_jar = "@bazel_tools//tools/jdk:platformclasspath",
     testdata_pkg = "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata",
 )
 
@@ -169,7 +168,7 @@ create_golden_test(
     has_bootclasspath = True,
     import_deps_checker = "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker",
     missing_jar = "testdata_lib_LibraryException",
-    rt_jar = "@local_jdk//:jre/lib/rt.jar",
+    rt_jar = "@bazel_tools//tools/jdk:platformclasspath",
     testdata_pkg = "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata",
 )
 
@@ -182,7 +181,7 @@ create_golden_test(
     has_bootclasspath = True,
     import_deps_checker = "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker",
     missing_jar = "testdata_lib_LibraryAnnotations",
-    rt_jar = "@local_jdk//:jre/lib/rt.jar",
+    rt_jar = "@bazel_tools//tools/jdk:platformclasspath",
     testdata_pkg = "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata",
 )
 
@@ -195,7 +194,7 @@ create_golden_test(
     has_bootclasspath = True,
     import_deps_checker = "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker",
     missing_jar = "testdata_lib_Library",
-    rt_jar = "@local_jdk//:jre/lib/rt.jar",
+    rt_jar = "@bazel_tools//tools/jdk:platformclasspath",
     testdata_pkg = "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata",
 )
 
@@ -209,7 +208,7 @@ create_golden_test(
     has_bootclasspath = True,
     import_deps_checker = "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker",
     missing_jar = "testdata_lib_LibraryInterface",
-    rt_jar = "@local_jdk//:jre/lib/rt.jar",
+    rt_jar = "@bazel_tools//tools/jdk:platformclasspath",
     testdata_pkg = "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata",
 )
 
@@ -224,7 +223,7 @@ create_golden_test(
     import_deps_checker = "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker",
     missing_jar = "testdata_lib_Library",
     replacing_jar = "testdata_lib_Library_no_members",
-    rt_jar = "@local_jdk//:jre/lib/rt.jar",
+    rt_jar = "@bazel_tools//tools/jdk:platformclasspath",
     testdata_pkg = "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata",
 )
 
@@ -239,21 +238,21 @@ create_golden_test(
     import_deps_checker = "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker",
     missing_jar = "testdata_lib_Library",
     replacing_jar = "testdata_lib_Library_no_members",
-    rt_jar = "@local_jdk//:jre/lib/rt.jar",
+    rt_jar = "@bazel_tools//tools/jdk:platformclasspath",
     testdata_pkg = "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata",
 )
 
 create_golden_test(
     name = "complete_classpath_golden_test",
     checking_mode = "error",
     expect_errors = False,
-    golden_output_file = "golden_silent_on_bootclasspath_missing_golden_test.txt",
+    golden_output_file = "golden_complete_classpath.txt",
     golden_stderr_file = "golden_complete_classpath.stderr.txt",
     has_bootclasspath = True,
     import_deps_checker = "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker",
     missing_jar = None,
     replacing_jar = None,
-    rt_jar = "@local_jdk//:jre/lib/rt.jar",
+    rt_jar = "@bazel_tools//tools/jdk:platformclasspath",
     testdata_pkg = "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata",
 )
 
@@ -306,12 +305,12 @@ sh_test(
     args = [
         "$(location golden_invoke_polymorphic_test.txt)",
         "$(location golden_invoke_polymorphic_test.stderr.txt)",
-        "199",
+        "0",
         "$(location :DumpProto)",
         "$(location //src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker)",
         "--checking_mode=error",
         "--bootclasspath_entry",
-        "$(location @local_jdk//:jre/lib/rt.jar)",
+        "$(location @bazel_tools//tools/jdk:platformclasspath)",
         "--input",
         "$(location //src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:libInvokePolymorphic.jar)",
     ],
@@ -322,7 +321,7 @@ sh_test(
         "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps:golden_invoke_polymorphic_test.stderr.txt",
         "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps:golden_invoke_polymorphic_test.txt",
         "//src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata:libInvokePolymorphic.jar",
-        "@local_jdk//:jre/lib/rt.jar",
+        "@bazel_tools//tools/jdk:platformclasspath",
     ],
 )
 

diff --git a/...a_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_test.sh b/...a_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_test.sh
@@ -54,7 +54,8 @@ if [[ "${checker_ret}" != ${expected_exit_code} ]]; then
   exit 1 # Exit with an error.
 fi
 
-diff "${gold_output_file}" <($PRINT_JDEPS_PROTO "${output_file}")
+# Correct for different paths between Blaze and Bazel.
+diff <(sed 's|third_party/bazel/||g' "${gold_output_file}") <($PRINT_JDEPS_PROTO "${output_file}" | sed 's|third_party/bazel/||g')
 gold_output_ret=$?
 
 if [[ "${gold_output_ret}" != 0 ]] ; then
@@ -71,7 +72,8 @@ if [[ "${gold_output_ret}" != 0 ]] ; then
   exit 1
 fi
 
-diff "${gold_stderr_file}" "${checker_stderr}"
+# Correct for different paths between Blaze and Bazel.
+diff <(sed 's|third_party/bazel/||g' "${gold_stderr_file}") <(sed 's|third_party/bazel/||g' "${checker_stderr}")
 gold_stderr_ret=$?
 
 if [[ "${gold_stderr_ret}" != 0 ]]; then