Eliminate BuildConfiguration.getShortName().

This was only used in error reporting, and the interface of BuildConfiguration could use some more simplicity. The comment on BuildConfiguration.getShortName() was confusing: that field is *not* actually used to compute the output directory name, which took me a few minutes to realize.

--
MOS_MIGRATED_REVID=97128287

3 files changed, 2 insertions, 9 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
index 97d1408293..88c72efe3f 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
@@ -171,11 +171,6 @@ public final class ActionsTestUtil {
     }
 
     @Override
-    public final String getConfigurationName() {
-      return "dummy-configuration";
-    }
-
-    @Override
     public String getConfigurationMnemonic() {
       return "dummy-configuration-mnemonic";
     }
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 dfa1cb36f5..431634d88d 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
@@ -60,8 +60,6 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
     }
 
     BuildConfiguration config = create("--platform_suffix=-test");
-    assertEquals("gcc-4.4.0-glibc-2.3.6-grte-k8-fastbuild-test",
-                 config.getShortName());
     assertEquals(outputBase + "/workspace/blaze-out/gcc-4.4.0-glibc-2.3.6-grte-k8-fastbuild-test",
         config.getOutputDirectory().getPath().toString());
   }
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 cb6c0892dd..e6fa83308c 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
@@ -348,8 +348,8 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
   protected final void createBuildView() throws Exception {
     Preconditions.checkNotNull(masterConfig);
     Preconditions.checkState(getHostConfiguration() == getTargetConfiguration()
-        || getHostConfiguration().getShortName().equals("host"),
-        "Host configuration %s does not have name 'host' "
+        || getHostConfiguration().isHostConfiguration(),
+        "Host configuration %s is not a host configuration' "
         + "and does not match target configuration %s",
         getHostConfiguration(), getTargetConfiguration());