aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test
diff options
context:
space:
mode:
authorGravatar Lukacs Berki <lberki@google.com>2015-05-21 08:11:26 +0000
committerGravatar Han-Wen Nienhuys <hanwen@google.com>2015-05-21 09:50:48 +0000
commit4eefe3d827510595f22be58c4ada1064d460ce5a (patch)
treea97d6b1de6fcdf3ec5103604680f2393077c0fd6 /src/test
parente22f76c69dbcacd26b76e522c28a4deed5675247 (diff)
A minor refactoring of our tests.
-- MOS_MIGRATED_REVID=94165994
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java6
1 files changed, 3 insertions, 3 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 63a64b0d74..a61f7814bf 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
@@ -145,7 +145,7 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
}
BuildConfigurationCollection master = createCollection(
- "--multi_cpu=k8", "--multi_cpu=piii", "--ignore_java_and_python_cpu");
+ "--multi_cpu=k8", "--multi_cpu=piii", "--ignore_java_cpu", "--ignore_python_cpu");
assertThat(master.getTargetConfigurations()).hasSize(2);
// Note: the cpus are sorted alphabetically.
assertEquals("k8", master.getTargetConfigurations().get(0).getCpu());
@@ -165,10 +165,10 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
BuildConfigurationCollection master;
if (order == 0) {
master = createCollection(
- "--multi_cpu=k8", "--multi_cpu=piii", "--ignore_java_and_python_cpu");
+ "--multi_cpu=k8", "--multi_cpu=piii", "--ignore_java_cpu", "--ignore_python_cpu");
} else {
master = createCollection(
- "--multi_cpu=piii", "--multi_cpu=k8", "--ignore_java_and_python_cpu");
+ "--multi_cpu=piii", "--multi_cpu=k8", "--ignore_java_cpu", "--ignore_python_cpu");
}
assertThat(master.getTargetConfigurations()).hasSize(2);
assertEquals("k8", master.getTargetConfigurations().get(0).getCpu());