diff options
| author |  Greg Estren <gregce@google.com> | 2016-11-30 22:31:28 +0000 |
|---|---|---|
| committer |  Irina Iancu <elenairina@google.com> | 2016-12-01 10:16:03 +0000 |
| commit | 2a2be3907981d9654575493c7012d95d1241f373 (patch) | |
| tree | a5fb99250980d9f0784192b037a6e6c6cc011402 /src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java | |
| parent | 07d012e97f6d15d02370a9c3ae08a720b31f31f0 (diff) | |
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
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java | 2 |
1 files changed, 1 insertions, 1 deletions
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", |