Remove undeclared test outputs after zipping on Windows

bazelbuild · Dec 13, 2022 · 743e71f · 743e71f
1 parent ccd8f48
commit 743e71f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/test/py/bazel/bazel_windows_test.py b/src/test/py/bazel/bazel_windows_test.py
@@ -425,9 +425,7 @@ def testZipUndeclaredTestOutputs(self):
         '//:foo_test',
     ], )
     self.AssertExitCode(exit_code, 0, stderr)
-    # FIXME: The Windows test runner does not delete the undeclared outputs
-    #  after zipping, which differs from the behavior on other platforms.
-    self.assertTrue(os.path.exists(output_file))
+    self.assertFalse(os.path.exists(output_file))
     self.assertTrue(os.path.exists(output_zip))
 
     # Run the test without undeclared outputs zipping.

diff --git a/tools/test/windows/tw.cc b/tools/test/windows/tw.cc
@@ -1297,6 +1297,18 @@ bool StartSubprocess(const Path& path, const std::wstring& args,
   return true;
 }
 
+bool RemoveRelativeRecursively(const Path& root,
+                               const std::vector<FileInfo>& files) {
+  Path path;
+  for (const auto& file : files) {
+    if (!(path.Set(file.RelativePath()) && path.Absolutize(root)
+        && RemoveRecursively(::blaze_util::WstringToCstring(path.Get())))) {
+      return false;
+    }
+  }
+  return true;
+}
+
 bool ArchiveUndeclaredOutputs(const UndeclaredOutputs& undecl) {
   if (undecl.root.Get().empty() || undecl.zip.Get().empty()) {
     // TEST_UNDECLARED_OUTPUTS_DIR was undefined, so there's nothing to archive,
@@ -1309,7 +1321,8 @@ bool ArchiveUndeclaredOutputs(const UndeclaredOutputs& undecl) {
   return GetFileListRelativeTo(undecl.root, &files) &&
          (files.empty() ||
           (CreateZip(undecl.root, files, undecl.zip) &&
-           CreateUndeclaredOutputsManifest(files, undecl.manifest)));
+           CreateUndeclaredOutputsManifest(files, undecl.manifest) &&
+           RemoveRelativeRecursively(files)));
 }
 
 // Creates the Undeclared Outputs Annotations file.