diff options
| author |  Lukacs Berki <lberki@google.com> | 2015-06-10 07:35:04 +0000 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2015-06-10 16:02:59 +0000 |
| commit | de7cd0b3663a62da20607369a3cfad82cc7c627f (patch) | |
| tree | 414720a4a86ed98d3756a4d266801cfddde05567 | |
| parent | 429a8b3fdd3f7bd2c00fd84724472052cd4ced27 (diff) | |
A minor refactoring.
--
MOS_MIGRATED_REVID=95612927
| -rw-r--r-- | site/docs/bazel-user-manual.html | 5 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/site/docs/bazel-user-manual.html b/site/docs/bazel-user-manual.html index 42dc5cd69a..9e186b48bf 100644 --- a/site/docs/bazel-user-manual.html +++ b/site/docs/bazel-user-manual.html @@ -800,9 +800,8 @@ $ bazel fetch //... </li> <li> Use the value of <code class="flag">--host_cpu</code> for - <code class='flag'>--cpu</code> - - and <code class='flag'>--java_cpu</code> (default: <code>k8</code>). + <code class='flag'>--cpu</code> and <code class='flag'>--java_cpu</code> + (default: <code>k8</code>). </li> <li>Use the same values of these options as specified in the request configuration: 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 a61f7814bf..1c7c2e2e9a 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_cpu", "--ignore_python_cpu"); + "--multi_cpu=k8", "--multi_cpu=piii", "--ignore_java_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_cpu", "--ignore_python_cpu"); + "--multi_cpu=k8", "--multi_cpu=piii", "--ignore_java_cpu"); } else { master = createCollection( - "--multi_cpu=piii", "--multi_cpu=k8", "--ignore_java_cpu", "--ignore_python_cpu"); + "--multi_cpu=piii", "--multi_cpu=k8", "--ignore_java_cpu"); } assertThat(master.getTargetConfigurations()).hasSize(2); assertEquals("k8", master.getTargetConfigurations().get(0).getCpu()); |