Close test.err before deleteing it

coeuvre · copybara-github · commit 958e0c485d5a · 2024-01-08T04:04:02.000-08:00
Unfortuantely, there isn't an easy way to add integration test for this specific edge case on Windows. Fixes #20741. Closes #20752. PiperOrigin-RevId: 596547046 Change-Id: I4f517b161c03793329d5a4e21ec8ac4a5b53abb0
diff --git a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
@@ -800,9 +800,12 @@ private TestAttemptResult runTestAttempt(
         // Make sure that the test.log exists.Spaw
         FileSystemUtils.touchFile(fileOutErr.getOutputPath());
       }
+      fileOutErr.close();
       // Append any error output to the test.log. This is very rare.
+      //
+      // Only write after the error output stream has been closed. Otherwise, Bazel cannot delete
+      // test.err file on Windows. See https://github.com/bazelbuild/bazel/issues/20741.
       writeOutFile(fileOutErr.getErrorPath(), fileOutErr.getOutputPath());
-      fileOutErr.close();
       if (streamed != null) {
         streamed.close();
       }

Original file line number	Diff line number	Diff line change
`@@ -800,9 +800,12 @@ private TestAttemptResult runTestAttempt(`
`800`	`800`	`// Make sure that the test.log exists.Spaw`
`801`	`801`	`FileSystemUtils.touchFile(fileOutErr.getOutputPath());`
`802`	`802`	`}`
	`803`	`+ fileOutErr.close();`
`803`	`804`	`// Append any error output to the test.log. This is very rare.`
	`805`	`+ //`
	`806`	`+ // Only write after the error output stream has been closed. Otherwise, Bazel cannot delete`
	`807`	`+ // test.err file on Windows. See https://github.com/bazelbuild/bazel/issues/20741.`
`804`	`808`	`writeOutFile(fileOutErr.getErrorPath(), fileOutErr.getOutputPath());`
`805`		`- fileOutErr.close();`
`806`	`809`	`if (streamed != null) {`
`807`	`810`	`streamed.close();`
`808`	`811`	`}`