Make the incompatibility between dynamic configurations

and --nodistinct_host_configuration explicit. This particularly
helps triaging the Bazel tests when --experimental_dynamic_configs
is on.

--
MOS_MIGRATED_REVID=105801590

2 files changed, 11 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
index c460e3dd84..9f75be4309 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
@@ -1101,6 +1101,11 @@ public final class BuildConfiguration {
           + "benefit from sharding certain tests. Please don't keep this option in your "
           + ".blazerc or continuous build"));
     }
+
+    if (options.useDynamicConfigurations && !options.useDistinctHostConfiguration) {
+      reporter.handle(Event.error(
+          "--nodistinct_host_configuration does not currently work with dynamic configurations"));
+    }
   }
 
   private ImmutableMap<String, String> setupShellEnvironment() {
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
index d40c4a01fa..eec0b88bd4 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
@@ -271,4 +271,10 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
     // Legitimately null option:
     assertNull(create().getOptionValue("test_filter"));
   }
+
+  public void testNoDistinctHostConfigurationUnsupportedWithDynamicConfigs() throws Exception {
+    checkError(
+        "--nodistinct_host_configuration does not currently work with dynamic configurations",
+        "--nodistinct_host_configuration", "--experimental_dynamic_configs");
+  }
 }