aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Greg Estren <gregce@google.com>2016-12-01 15:49:34 +0000
committerGravatar Irina Iancu <elenairina@google.com>2016-12-01 16:38:19 +0000
commit3216c4088fdd55b5873b10c0df3da8a025d94553 (patch)
tree1870cf977ddb14a2a1772ffd50b30e75040be700
parentb8caca0d153a32bb92193c9b3ef33f950c722b16 (diff)
Phrasing cleanup for dynamic configuration tests.
-- MOS_MIGRATED_REVID=140729772
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java7
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java2
2 files changed, 4 insertions, 5 deletions
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 48e207cdb1..6e7d1064b6 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
@@ -297,10 +297,9 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
}
@Test
- public void testNoDistinctHostConfigurationUnsupportedWithDynamicConfigs() throws Exception {
- String expectedError =
- "--nodistinct_host_configuration does not currently work with dynamic configurations";
- checkError(expectedError,
+ public void testNoDistinctHostConfigurationUnsupportedWithTrimmedConfigs() throws Exception {
+ checkError(
+ "--nodistinct_host_configuration does not currently work with dynamic configurations",
"--nodistinct_host_configuration", "--experimental_dynamic_configs=on");
assertThat(create("--nodistinct_host_configuration", "--experimental_dynamic_configs=notrim"))
.isNotNull();
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
index b36cc32010..7bf11a80e0 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
@@ -95,7 +95,7 @@ public abstract class AnalysisTestCase extends FoundationTestCase {
SKYFRAME_LOADING_PHASE,
// Dynamic configurations that only include the fragments a target needs to properly analyze.
DYNAMIC_CONFIGURATIONS,
- // Dynamic configurations that always include all fragments even for targets don't need them.
+ // Dynamic configurations that always include all fragments even when targets don't need them.
DYNAMIC_CONFIGURATIONS_NOTRIM
}