Disable `repo_mapping` by default via a flag.

RELNOTES: None
PiperOrigin-RevId: 199374368

3 files changed, 40 insertions, 10 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTest.java b/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTest.java
index ce06be666f..eb23ff4572 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTest.java
@@ -120,6 +120,7 @@ public class WorkspaceFactoryTest {
 
   @Test
   public void testWorkspaceMappings() throws Exception {
+    helper.setSkylarkSemantics("--experimental_enable_repo_mapping");
     helper.parse(
         "local_repository(",
         "    name = 'foo',",
@@ -128,9 +129,10 @@ public class WorkspaceFactoryTest {
         ")");
     assertMapping(helper, "@foo", "@x", "@y");
   }
-
+  
   @Test
   public void testMultipleRepositoriesWithMappings() throws Exception {
+    helper.setSkylarkSemantics("--experimental_enable_repo_mapping");
     helper.parse(
         "local_repository(",
         "    name = 'foo',",
@@ -148,6 +150,7 @@ public class WorkspaceFactoryTest {
 
   @Test
   public void testMultipleMappings() throws Exception {
+    helper.setSkylarkSemantics("--experimental_enable_repo_mapping");
     helper.parse(
         "local_repository(",
         "    name = 'foo',",
@@ -161,6 +164,7 @@ public class WorkspaceFactoryTest {
 
   @Test
   public void testEmptyMappings() throws Exception {
+    helper.setSkylarkSemantics("--experimental_enable_repo_mapping");
     helper.parse(
         "local_repository(",
         "    name = 'foo',",
@@ -172,6 +176,7 @@ public class WorkspaceFactoryTest {
 
   @Test
   public void testMappingsNotAMap() throws Exception {
+    helper.setSkylarkSemantics("--experimental_enable_repo_mapping");
     helper.parse(
         "local_repository(",
         "    name = 'foo',",
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RepositoryMappingFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RepositoryMappingFunctionTest.java
index 971b1e81fe..8a1aa0b20e 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/RepositoryMappingFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/RepositoryMappingFunctionTest.java
@@ -48,6 +48,7 @@ public class RepositoryMappingFunctionTest extends BuildViewTestCase {
 
   @Test
   public void testSimpleMapping() throws Exception {
+    setSkylarkSemanticsOptions("--experimental_enable_repo_mapping");
     scratch.overwriteFile(
         "WORKSPACE",
         "workspace(name = 'good')",
@@ -70,6 +71,7 @@ public class RepositoryMappingFunctionTest extends BuildViewTestCase {
 
   @Test
   public void testMultipleRepositoriesWithMapping() throws Exception {
+    setSkylarkSemanticsOptions("--experimental_enable_repo_mapping");
     scratch.overwriteFile(
         "WORKSPACE",
         "workspace(name = 'good')",
@@ -102,6 +104,7 @@ public class RepositoryMappingFunctionTest extends BuildViewTestCase {
 
   @Test
   public void testRepositoryWithMultipleMappings() throws Exception {
+    setSkylarkSemanticsOptions("--experimental_enable_repo_mapping");
     scratch.overwriteFile(
         "WORKSPACE",
         "workspace(name = 'good')",
@@ -124,6 +127,7 @@ public class RepositoryMappingFunctionTest extends BuildViewTestCase {
 
   @Test
   public void testErrorWithMapping() throws Exception {
+    setSkylarkSemanticsOptions("--experimental_enable_repo_mapping");
     reporter.removeHandler(failFastHandler);
     scratch.overwriteFile(
         "WORKSPACE",
@@ -145,6 +149,7 @@ public class RepositoryMappingFunctionTest extends BuildViewTestCase {
 
   @Test
   public void testEmptyMapping() throws Exception {
+    setSkylarkSemanticsOptions("--experimental_enable_repo_mapping");
     scratch.overwriteFile(
         "WORKSPACE",
         "workspace(name = 'good')",
@@ -164,7 +169,27 @@ public class RepositoryMappingFunctionTest extends BuildViewTestCase {
   }
 
   @Test
-  public void testNoMappings() throws Exception {
+  public void testNoMappings_noFlag() throws Exception {
+    setSkylarkSemanticsOptions("--noexperimental_enable_repo_mapping");
+    scratch.overwriteFile(
+        "WORKSPACE",
+        "workspace(name = 'good')",
+        "local_repository(",
+        "    name = 'a_remote_repo',",
+        "    path = '/a_remote_repo',",
+        ")");
+    RepositoryName name = RepositoryName.create("@a_remote_repo");
+    SkyKey skyKey = RepositoryMappingValue.key(name);
+
+    assertThatEvaluationResult(eval(skyKey))
+        .hasEntryThat(skyKey)
+        .isEqualTo(
+            RepositoryMappingValue.withMapping(ImmutableMap.of()));
+  }
+
+  @Test
+  public void testNoMappings_withFlag() throws Exception {
+    setSkylarkSemanticsOptions("--experimental_enable_repo_mapping");
     scratch.overwriteFile(
         "WORKSPACE",
         "workspace(name = 'good')",
diff --git a/src/test/shell/bazel/workspace_test.sh b/src/test/shell/bazel/workspace_test.sh
index 8a7fa1fc5d..7addf93a08 100755
--- a/src/test/shell/bazel/workspace_test.sh
+++ b/src/test/shell/bazel/workspace_test.sh
@@ -348,13 +348,13 @@ EOF
   cd tree
 
   # Do initial load of the packages
-  bazel query --noexperimental_ui //oak:all >& "$TEST_log" \
-        || fail "Expected success"
+  bazel query --experimental_enable_repo_mapping --noexperimental_ui \
+        //oak:all >& "$TEST_log" || fail "Expected success"
   expect_log "Loading package: oak"
   expect_log "//oak:oak"
 
-  bazel query --noexperimental_ui @flower//daisy:all >& "$TEST_log" \
-        || fail "Expected success"
+  bazel query --experimental_enable_repo_mapping --noexperimental_ui \
+        @flower//daisy:all >& "$TEST_log" || fail "Expected success"
   expect_log "Loading package: @flower//daisy"
   expect_log "@flower//daisy:daisy"
 
@@ -369,14 +369,14 @@ local_repository(
 EOF
 
   # Test that packages in the tree workspace are not affected
-  bazel query --noexperimental_ui //oak:all >& "$TEST_log" \
-        || fail "Expected success"
+  bazel query --experimental_enable_repo_mapping --noexperimental_ui \
+        //oak:all >& "$TEST_log" || fail "Expected success"
   expect_not_log "Loading package: oak"
   expect_log "//oak:oak"
 
   # Test that packages in the flower workspace are reloaded
-  bazel query --noexperimental_ui @flower//daisy:all >& "$TEST_log" \
-        || fail "Expected success"
+  bazel query --experimental_enable_repo_mapping --noexperimental_ui \
+        @flower//daisy:all >& "$TEST_log" || fail "Expected success"
   expect_log "Loading package: @flower//daisy"
   expect_log "@flower//daisy:daisy"
 }