commit 619dcf82d55bc1a269a61a55fb508aab113b1650
author janakr <janakr@google.com> Tue Sep 22 14:08:59 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Sep 22 14:10:06 2020 -0700
tree 4bf18c6456b7d74fde61b990effa27548d40b2f7
parent f12a7ad911722972b12856649a5a2fc7b795e86a

Unconditionally include the "message", if any, in SimpleSpawnResult. This is the same logic as used in Google-internal code. This allows us to stop passing the verboseFailures boolean around everywhere, since it's then only needed in one place in AbstractSpawnStrategy.

I don't think this justifies a RELNOTES, but ok if you'd prefer one.

#11151

PiperOrigin-RevId: 333156319

src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
index 32154dc..eefdbc8 100644
--- a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
@@ -151,7 +151,8 @@
                 (env, binTools1, fallbackTmpDir) -> ImmutableMap.copyOf(env),
                 binTools,
                 /*processWrapper=*/ null,
-                Mockito.mock(RunfilesTreeUpdater.class)));
+                Mockito.mock(RunfilesTreeUpdater.class)),
+            /*verboseFailures=*/ false);
     this.executor =
         new TestExecutorBuilder(fileSystem, directories, binTools)
             .addStrategy(strategy, "standalone")
@@ -313,8 +314,7 @@
   @Test
   public void testVerboseFailures() {
     ExecException e = assertThrows(ExecException.class, () -> run(createSpawn(getFalseCommand())));
-    ActionExecutionException actionExecutionException =
-        e.toActionExecutionException("", /* verboseFailures= */ true, null);
+    ActionExecutionException actionExecutionException = e.toActionExecutionException("", null);
     assertWithMessage("got: " + actionExecutionException.getMessage())
         .that(actionExecutionException.getMessage().contains("failed: error executing command"))
         .isTrue();