clean duplicate error message of the command line of a failed command which is printed twice when using --verbose_failures.

--
MOS_MIGRATED_REVID=115342536

3 files changed, 6 insertions, 19 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/actions/EnvironmentalExecException.java b/src/main/java/com/google/devtools/build/lib/actions/EnvironmentalExecException.java
index f488728268..d8bf028883 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/EnvironmentalExecException.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/EnvironmentalExecException.java
@@ -47,12 +47,7 @@ public class EnvironmentalExecException extends ExecException {
   @Override
   public ActionExecutionException toActionExecutionException(String messagePrefix,
         boolean verboseFailures, Action action) {
-    if (verboseFailures) {
-      return new ActionExecutionException(
-          messagePrefix + " failed (" + getMessage() + ")", this, action, isCatastrophic());
-    } else {
-      return new ActionExecutionException(
-          messagePrefix + " failed (" + getMessage() + ")", action, isCatastrophic());
-    }
+    String message = messagePrefix + " failed";
+    return new ActionExecutionException(message, this, action, isCatastrophic());
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/actions/TestExecException.java b/src/main/java/com/google/devtools/build/lib/actions/TestExecException.java
index 003d5c1f09..62976012d5 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/TestExecException.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/TestExecException.java
@@ -25,11 +25,7 @@ public final class TestExecException extends ExecException {
   @Override
   public ActionExecutionException toActionExecutionException(String messagePrefix,
       boolean verboseFailures, Action action) {
-    String message = messagePrefix + " failed" + getMessage();
-    if (verboseFailures) {
-      return new ActionExecutionException(message, this, action, isCatastrophic());
-    } else {
-      return new ActionExecutionException(message, action, isCatastrophic());
-    }
+    String message = messagePrefix + " failed";
+    return new ActionExecutionException(message, this, action, isCatastrophic());
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/actions/UserExecException.java b/src/main/java/com/google/devtools/build/lib/actions/UserExecException.java
index d79d6f582e..bdb52ab64e 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/UserExecException.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/UserExecException.java
@@ -43,11 +43,7 @@ public class UserExecException extends ExecException {
   @Override
   public ActionExecutionException toActionExecutionException(String messagePrefix,
         boolean verboseFailures, Action action) {
-    String message = messagePrefix + " failed: " + getMessage();
-    if (verboseFailures) {
-      return new ActionExecutionException(message, this, action, isCatastrophic());
-    } else {
-      return new ActionExecutionException(message, action, isCatastrophic());
-    }
+    String message = messagePrefix + " failed";
+    return new ActionExecutionException(message, this, action, isCatastrophic());
   }
 }