From 2a2be3907981d9654575493c7012d95d1241f373 Mon Sep 17 00:00:00 2001 From: Greg Estren Date: Wed, 30 Nov 2016 22:31:28 +0000 Subject: Overrides BuildConfiguration.equals() for dynamic configs. This makes ConstraintsTest#hostDependenciesNotCheckedNoDistinctHostConfiguration pass with --experimental_dynamic_configs=notrim (the host config is the same as the target config but it's still a separate instance). -- MOS_MIGRATED_REVID=140652716 --- .../com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java') diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java index 9cf952c200..d9dd9ae4ae 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java @@ -426,7 +426,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { */ protected final void createBuildView() throws Exception { Preconditions.checkNotNull(masterConfig); - Preconditions.checkState(getHostConfiguration() == getTargetConfiguration() + Preconditions.checkState(getHostConfiguration().equals(getTargetConfiguration()) || getHostConfiguration().isHostConfiguration(), "Host configuration %s is not a host configuration' " + "and does not match target configuration %s", -- cgit v1.2.3