Fix message generation of ActionExecutionException"

This fixes an issue introduced by commit
f95b80d, which resulted in certain
exception message being printed twice.

site/en/reference/test-encyclopedia.md

@@ -226,7 +226,8 @@ to run - for example, using a round-robin strategy. Not all test runners support
 sharding. If a runner supports sharding, it must create or update the last
 modified date of the file specified by
 [`TEST_SHARD_STATUS_FILE`](#initial-conditions). Otherwise, Bazel assumes it
-does not support sharding and will not launch additional runners.
+does not support sharding and will not launch additional runners or report an
+error (see [`--incompatible_check_sharding_support`]((/reference/command-line-reference#flag--incompatible_check_sharding_support)).
 
 ## Initial conditions {:#initial-conditions}
 

src/main/java/com/google/devtools/build/lib/actions/ActionExecutionException.java

@@ -57,7 +57,7 @@ public ActionExecutionException(
       ActionAnalysisMetadata action,
       boolean catastrophe,
       DetailedExitCode detailedExitCode) {
-    super(combineMessages(message, cause), cause);
+    super(message, cause);
     this.action = action;
     this.catastrophe = catastrophe;
     this.detailedExitCode = checkNotNull(detailedExitCode);
@@ -96,7 +96,7 @@ public ActionExecutionException(
       NestedSet<Cause> rootCauses,
       boolean catastrophe,
       DetailedExitCode detailedExitCode) {
-    super(combineMessages(message, cause), cause);
+    super(message, cause);
     this.action = action;
     this.rootCauses = rootCauses;
     this.catastrophe = catastrophe;
@@ -203,12 +203,4 @@ public DetailedExitCode getDetailedExitCode() {
   public boolean showError() {
     return getMessage() != null;
   }
-
-  @Nullable
-  private static String combineMessages(String message, @Nullable Throwable cause) {
-    if (cause == null || cause.getMessage() == null) {
-      return message;
-    }
-    return message + ": " + cause.getMessage();
-  }
 }

src/test/java/com/google/devtools/build/lib/actions/BUILD

@@ -64,7 +64,6 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils:depsutils",
         "//src/main/java/com/google/devtools/build/lib/util",
-        "//src/main/java/com/google/devtools/build/lib/util:detailed_exit_code",
         "//src/main/java/com/google/devtools/build/lib/util:filetype",
         "//src/main/java/com/google/devtools/build/lib/util:string",
         "//src/main/java/com/google/devtools/build/lib/vfs",

src/test/py/bazel/bazel_windows_test.py

@@ -463,15 +463,17 @@ def testTestShardStatusFile(self):
     )
     self.ScratchFile('foo.sh')
 
-    exit_code, stdout, stderr = self.RunBazel(['test', '//:foo_test'])
+    exit_code, stdout, stderr = self.RunBazel(
+        ['test', '--incompatible_check_sharding_support', '//:foo_test'])
     # Check for "tests failed" exit code
     self.AssertExitCode(exit_code, 3, stderr, stdout)
     self.assertIn("Sharding requested, but the test runner did not advertise "
                   "support for it by touching TEST_SHARD_STATUS_FILE.", stderr)
 
     self.ScratchFile('foo.sh', ['touch "$TEST_SHARD_STATUS_FILE"'])
 
-    exit_code, stdout, stderr = self.RunBazel(['test', '//:foo_test'])
+    exit_code, stdout, stderr = self.RunBazel(
+        ['test', '--incompatible_check_sharding_support', '//:foo_test'])
     self.AssertExitCode(exit_code, 0, stderr, stdout)