Fix javatools and enable tests in BazelCI. Closes #8164. PiperOrigin-RevId: 245426722

diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
index 67ef79a..713fd6b 100644
--- a/.bazelci/postsubmit.yml
+++ b/.bazelci/postsubmit.yml

@@ -13,7 +13,7 @@
     test_targets:
     - "--"
     - "//scripts/..."
-    - "//src/java_tools/junitrunner/javatests/..."
+    - "//src/java_tools/..."
     - "//src/test/..."
     - "//src/tools/singlejar/..."
     - "//third_party/ijar/..."
@@ -22,6 +22,9 @@
     - "//tools/python/..."
     # TODO(iirina): Re-enable after #7952 was released.
     - "-//src/test/shell/bazel:embedded_tools_deps_test"
+    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
+    - "-//src/java_tools/buildjar/..."
+    - "-//src/java_tools/import_deps_checker/..."
   ubuntu1604:
     shell_commands:
     - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -35,7 +38,7 @@
     test_targets:
     - "--"
     - "//scripts/..."
-    - "//src/java_tools/junitrunner/javatests/..."
+    - "//src/java_tools/..."
     - "//src/test/..."
     - "//src/tools/singlejar/..."
     - "//third_party/ijar/..."
@@ -44,6 +47,9 @@
     - "//tools/python/..."
     # TODO(iirina): Re-enable after #7952 was released.
     - "-//src/test/shell/bazel:embedded_tools_deps_test"
+    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
+    - "-//src/java_tools/buildjar/..."
+    - "-//src/java_tools/import_deps_checker/..."
   ubuntu1804:
     shell_commands:
     - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -57,7 +63,7 @@
     test_targets:
     - "--"
     - "//scripts/..."
-    - "//src/java_tools/junitrunner/javatests/..."
+    - "//src/java_tools/..."
     - "//src/test/..."
     - "//src/tools/singlejar/..."
     - "//third_party/ijar/..."
@@ -71,6 +77,8 @@
     - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test"
     # TODO(iirina): Re-enable after #7952 was released.
     - "-//src/test/shell/bazel:embedded_tools_deps_test"
+    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
+    - "-//src/java_tools/import_deps_checker/..."
   ubuntu1804_javabase9:
     platform: ubuntu1804_nojava
     name: ":java: OpenJDK 9 Javabase"
@@ -89,13 +97,15 @@
     test_targets:
     - "--"
     - "//scripts/..."
-    - "//src/java_tools/junitrunner/javatests/..."
+    - "//src/java_tools/..."
     - "//src/test/..."
     - "//src/tools/singlejar/..."
     - "//third_party/ijar/..."
     - "//tools/aquery_differ/..."
     - "//tools/android/..."
     - "//tools/python/..."
+    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
+    - "-//src/java_tools/import_deps_checker/..."
     # Currently broken tests on this platform.
     # These tests do not work without an installed system JDK:
     # (see https://github.com/bazelbuild/bazel/issues/6214#issuecomment-424813868)
@@ -153,13 +163,15 @@
     test_targets:
     - "--"
     - "//scripts/..."
-    - "//src/java_tools/junitrunner/javatests/..."
+    - "//src/java_tools/..."
     - "//src/test/..."
     - "//src/tools/singlejar/..."
     - "//third_party/ijar/..."
     - "//tools/aquery_differ/..."
     - "//tools/android/..."
     - "//tools/python/..."
+    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
+    - "-//src/java_tools/import_deps_checker/..."
     # Currently broken tests on this platform.
     # These tests do not work without an installed system JDK:
     # (see https://github.com/bazelbuild/bazel/issues/6214#issuecomment-424813868)

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 59beb06..cad1a14 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml

@@ -13,7 +13,7 @@
     test_targets:
     - "--"
     - "//scripts/..."
-    - "//src/java_tools/junitrunner/javatests/..."
+    - "//src/java_tools/..."
     - "//src/test/..."
     - "//src/tools/execlog/..."
     - "//src/tools/singlejar/..."
@@ -26,6 +26,9 @@
     - "-//src/test/shell/bazel:bazel_determinism_test"
     # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663
     - "-//src/test/shell/bazel/android:android_ndk_integration_test"
+    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
+    - "-//src/java_tools/buildjar/..."
+    - "-//src/java_tools/import_deps_checker/..."
   ubuntu1604:
     shell_commands:
     - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -39,7 +42,7 @@
     test_targets:
     - "--"
     - "//scripts/..."
-    - "//src/java_tools/junitrunner/javatests/..."
+    - "//src/java_tools/..."
     - "//src/test/..."
     - "//src/tools/execlog/..."
     - "//src/tools/singlejar/..."
@@ -52,6 +55,9 @@
     - "-//src/test/shell/bazel:bazel_determinism_test"
     # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663
     - "-//src/test/shell/bazel/android:android_ndk_integration_test"
+    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
+    - "-//src/java_tools/buildjar/..."
+    - "-//src/java_tools/import_deps_checker/..."
   ubuntu1804:
     shell_commands:
     - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -65,7 +71,7 @@
     test_targets:
     - "--"
     - "//scripts/..."
-    - "//src/java_tools/junitrunner/javatests/..."
+    - "//src/java_tools/..."
     - "//src/test/..."
     - "//src/tools/execlog/..."
     - "//src/tools/singlejar/..."
@@ -83,6 +89,8 @@
     - "-//src/test/shell/bazel:maven_test"
     # Re-enable once bootstrap works with Java 11
     - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test"
+    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
+    - "-//src/java_tools/import_deps_checker/..."
   ubuntu1804_javabase9:
     platform: ubuntu1804_nojava
     name: ":java: OpenJDK 9 Javabase"
@@ -101,7 +109,7 @@
     test_targets:
     - "--"
     - "//scripts/..."
-    - "//src/java_tools/junitrunner/javatests/..."
+    - "//src/java_tools/..."
     - "//src/test/..."
     - "//src/tools/execlog/..."
     - "//src/tools/singlejar/..."
@@ -112,6 +120,8 @@
     - "//tools/python/..."
     # Disable Slow Tests
     - "-//src/test/shell/bazel:bazel_determinism_test"
+    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
+    - "-//src/java_tools/import_deps_checker/..."
     # These tests do not work without an installed system JDK:
     # (see https://github.com/bazelbuild/bazel/issues/6214#issuecomment-424813868)
     - "-//src/test/java/com/google/devtools/build/android/..."
@@ -165,7 +175,7 @@
     test_targets:
     - "--"
     - "//scripts/..."
-    - "//src/java_tools/junitrunner/javatests/..."
+    - "//src/java_tools/..."
     - "//src/test/..."
     - "//src/tools/execlog/..."
     - "//src/tools/singlejar/..."
@@ -176,6 +186,8 @@
     - "//tools/python/..."
     # Disable Slow Tests
     - "-//src/test/shell/bazel:bazel_determinism_test"
+    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
+    - "-//src/java_tools/import_deps_checker/..."
     # These tests do not work without an installed system JDK:
     # (see https://github.com/bazelbuild/bazel/issues/6214#issuecomment-424813868)
     - "-//src/test/java/com/google/devtools/build/android/..."

diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar/VanillaJavaBuilderTest.java b/src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar/VanillaJavaBuilderTest.java
index 7194c7b..7c1fc8a 100644
--- a/src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar/VanillaJavaBuilderTest.java
+++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar/VanillaJavaBuilderTest.java

@@ -176,8 +176,6 @@
                 source.toString(),
                 "--output",
                 output.toString(),
-                "--bootclasspath",
-                Paths.get(System.getProperty("java.home")).resolve("lib/rt.jar").toString(),
                 "--tempdir",
                 temporaryFolder.newFolder().toString(),
                 "--classdir",

diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/AbstractJavacTurbineCompilationTest.java b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/AbstractJavacTurbineCompilationTest.java
index 2f956d4..e6c11bf 100644
--- a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/AbstractJavacTurbineCompilationTest.java
+++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/AbstractJavacTurbineCompilationTest.java

@@ -20,7 +20,6 @@
 
 import com.google.common.io.ByteStreams;
 import com.google.devtools.build.buildjar.jarhelper.JarCreator;
-import com.google.devtools.build.java.bazel.JavacBootclasspath;
 import com.google.devtools.build.java.turbine.javac.JavacTurbine.Result;
 import com.google.turbine.options.TurbineOptions;
 import java.io.BufferedWriter;
@@ -74,8 +73,6 @@
     optionsBuilder
         .setOutput(output.toString())
         .setTempDir(tempdir.toString())
-        .addBootClassPathEntries(
-            JavacBootclasspath.asPaths().stream().map(Path::toString).collect(toImmutableList()))
         .setOutputDeps(outputDeps.toString())
         .addAllJavacOpts(Arrays.asList("-source", "8", "-target", "8"))
         .setTargetLabel("//test");

diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD
index 039902d..c1b9178 100644
--- a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD
+++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD

@@ -25,10 +25,6 @@
     data = [
         "//third_party/java/jdk/langtools:javac_jar",
     ],
-    jvm_flags = [
-        # Simulates how Bazel invokes turbine
-        "-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar)",
-    ],
     deps = [
         ":AbstractJavacTurbineCompilationTest",
         "//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac:javac_turbine",
@@ -47,10 +43,6 @@
     name = "ProcessorClasspathTest_bootclasspath",
     srcs = ["//src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac:ProcessorClasspathTest.java"],
     data = ["//third_party/java/jdk/langtools:javac_jar"],
-    jvm_flags = [
-        # Simulates how Bazel invokes turbine
-        "-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar)",
-    ],
     test_class = "com.google.devtools.build.java.turbine.javac.ProcessorClasspathTest",
     deps = [
         "//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac:javac_turbine",
@@ -72,10 +64,6 @@
     data = [
         "//third_party/java/jdk/langtools:javac_jar",
     ],
-    jvm_flags = [
-        # Simulates how Bazel invokes turbine
-        "-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar)",
-    ],
     deps = [
         "//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac:tree_pruner",
         "//third_party:guava",

diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java
index 8ba3fc5..79c27ac 100644
--- a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java
+++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java

@@ -1487,11 +1487,10 @@
   }
 
   private static Set<String> filterManifestEntries(Set<String> entries) {
-    return entries
-        .stream()
+    return entries.stream()
         .filter(
             name ->
-                !(name.equals(JavacTurbine.MANIFEST_DIR)
+                !(name.startsWith(JavacTurbine.MANIFEST_DIR)
                     || name.equals(JavacTurbine.MANIFEST_NAME)))
         .collect(toSet());
   }