Fix capturing stdin/stdout on Windows.

1. Return EOF for streams representing Windows process pipes.
2. Fix the timing of process.close()
3. Un-synchronized reading of stderr and stdout.

--
Change-Id: Iec98f45db9984be2c2b066962801cbd3ca60da3f
Reviewed-on: https://bazel-review.googlesource.com/#/c/4000/
MOS_MIGRATED_REVID=126910063

1 files changed, 5 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/shell/Command.java b/src/main/java/com/google/devtools/build/lib/shell/Command.java
index 84f78d2ae3..79b850acad 100644
--- a/src/main/java/com/google/devtools/build/lib/shell/Command.java
+++ b/src/main/java/com/google/devtools/build/lib/shell/Command.java
@@ -819,9 +819,6 @@ public final class Command {
 
     TerminationStatus status = waitForProcess(process, killSubprocessOnInterrupt);
     observer.stopObserving(processKillable);
-    // #close() must be called after the #stopObserving() so that a badly-timed timeout does not
-    // try to destroy a process that is already closed
-    process.close();
 
     log.finer(status.toString());
 
@@ -849,6 +846,11 @@ public final class Command {
           : new AbnormalTerminationException(this,
               noOutputResult, message, ioe);
       }
+    } finally {
+      // #close() must be called after the #stopObserving() so that a badly-timed timeout does not
+      // try to destroy a process that is already closed, and after outErr is completed,
+      // so that it has a chance to read the entire output is captured.
+      process.close();
     }
 
     CommandResult result =