Mock rules_java_builtin

bazelbuild · Jun 1, 2023 · 4f7629b · 4f7629b
1 parent 2a785d4
commit 4f7629b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
@@ -70,6 +70,7 @@ public ImmutableList<String> getWorkspaceContents(MockToolsConfig config) {
         "local_repository(name = 'local_config_xcode', path = '" + xcodeWorkspace + "')",
         "local_repository(name = 'com_google_protobuf', path = '" + protobufWorkspace + "')",
         "local_repository(name = 'rules_java', path = '" + rulesJavaWorkspace + "')",
+        "local_repository(name = 'rules_java_builtin', path = '" + rulesJavaWorkspace + "')",
         "local_repository(name = 'android_gmaven_r8', path = '" + androidGmavenR8Workspace + "')",
         "register_toolchains('@rules_java//java/toolchains/runtime:all')",
         "register_toolchains('@rules_java//java/toolchains/javac:all')",
@@ -96,7 +97,8 @@ public ImmutableList<String> getWorkspaceRepos() {
         "local_config_platform",
         "local_config_xcode",
         "platforms",
-        "rules_java");
+        "rules_java",
+        "rules_java_builtin");
   }
 
   @Override

diff --git a/src/test/shell/bazel/bazel_package_loader_test.sh b/src/test/shell/bazel/bazel_package_loader_test.sh
@@ -37,11 +37,11 @@ sh_library(name = 'y')
 sh_library(name = 'z')
 EOF
 
-  # Override rules_java in WORKSPACE
+  # Override rules_java_builtin in WORKSPACE
   rules_java_workspace="${TEST_TMPDIR}/rules_java_workspace"
   cat > WORKSPACE <<EOF
 local_repository(
-    name = "rules_java",
+    name = "rules_java_builtin",
     path = "${rules_java_workspace}",
 )
 EOF

diff --git a/src/test/shell/testenv.sh.tmpl b/src/test/shell/testenv.sh.tmpl
@@ -837,4 +837,5 @@ def java_test(**attrs):
     native.java_test(**attrs)
 EOF
   add_to_bazelrc "common --override_repository=rules_java=${rules_java_workspace}"
+  add_to_bazelrc "common --override_repository=rules_java_builtin=${rules_java_workspace}"
 }