Add OutErr#close, and call that in test strategies.

This fixes "Text file is busy" when trying to execute log files for local tests just
after blaze finishes.

--
MOS_MIGRATED_REVID=86597766

1 files changed, 9 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/StandaloneTestStrategy.java b/src/main/java/com/google/devtools/build/lib/rules/test/StandaloneTestStrategy.java
index d452afba72..72970a83ae 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/test/StandaloneTestStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/test/StandaloneTestStrategy.java
@@ -91,9 +91,10 @@ public class StandaloneTestStrategy extends TestStrategy {
     Executor executor = actionExecutionContext.getExecutor();
 
     ResourceSet resources = null;
+    FileOutErr fileOutErr = null;
     try {
       FileSystemUtils.createDirectoryAndParents(workingDirectory);
-      FileOutErr fileOutErr = new FileOutErr(action.getTestLog().getPath(),
+      fileOutErr = new FileOutErr(action.getTestLog().getPath(),
           action.resolve(actionExecutionContext.getExecutor().getExecRoot()).getTestStderr());
 
       resources = action.getTestProperties().getLocalResourceUsage();
@@ -109,6 +110,13 @@ public class StandaloneTestStrategy extends TestStrategy {
       if (resources != null) {
         ResourceManager.instance().releaseResources(action, resources);
       }
+      try {
+        if (fileOutErr != null) {
+          fileOutErr.close();
+        }
+      } catch (IOException e) {
+        // If the close fails, there is little we can do.
+      }
     }
   }