LibclangTest: remove libclang-test-* tmp dir reliably

[vedgy]

Summary

Temporary directories created by two LibclangReparseTest tests -
ReparseWithModule and clang_parseTranslationUnit2FullArgv - remained in
the system temporary directory after running libclangTests, because not
all files and subdirectories created in TestDir were added to set
LibclangParseTest::Files.

[vedgy]

@aaron.ballman, this test fix is independent from D143418 and can be reviewed separately.

[vedgy]

Rebase on latest main branch

[aaron.ballman]

LGTM!

[vedgy]

Can someone merge/land this review? I don't have commit access.

[aaron.ballman]

In D143415#4160550, @vedgy wrote:

Can someone merge/land this review? I don't have commit access.

I'm happy to do that for you -- what name and email address would you like me to use for patch attribution?

[vedgy]

In D143415#4161460, @aaron.ballman wrote:

In D143415#4160550, @vedgy wrote:

Can someone merge/land this review? I don't have commit access.

I'm happy to do that for you -- what name and email address would you like me to use for patch attribution?

user.email=[e-mail]
user.name=Igor Kushnir

A pity that Phabricator doesn't pick up git user name and email.

[aaron.ballman]

In D143415#4161495, @vedgy wrote:

In D143415#4161460, @aaron.ballman wrote:

In D143415#4160550, @vedgy wrote:

Can someone merge/land this review? I don't have commit access.

I'm happy to do that for you -- what name and email address would you like me to use for patch attribution?

user.email=[e-mail]
user.name=Igor Kushnir

Thanks!

A pity that Phabricator doesn't pick up git user name and email.

Yeah, Phab works well for a lot of things but still has some rough edges unfortunately. I've landed this on your behalf in 3eceab95f314edb85ee72c047a4acd35e757d037

clang/unittests/libclang/LibclangTest.cpp

TEST_F(LibclangReparseTest, ReparseWithModule) {
   const char *ModFile = "module A { header \"HeaderFile.h\" }\n";
   std::string HeaderName = "HeaderFile.h";
   std::string MName = "MFile.m";
   std::string ModName = "module.modulemap";
   WriteFile(MName, MFile);
   WriteFile(HeaderName, std::string(HeaderTop) + HeaderBottom);
   WriteFile(ModName, ModFile);
 
+  // Removing recursively is necessary to delete the module cache.
+  RemoveTestDirRecursivelyDuringTeardown = true;
   std::string ModulesCache = std::string("-fmodules-cache-path=") + TestDir;
   const char *Args[] = { "-fmodules", ModulesCache.c_str(),
                          "-I", TestDir.c_str() };
   int NumArgs = std::size(Args);
   ClangTU = clang_parseTranslationUnit(Index, MName.c_str(), Args, NumArgs,
                                        nullptr, 0, TUFlags);
   EXPECT_EQ(1U, clang_getNumDiagnostics(ClangTU));
   DisplayDiagnostics();

clang/unittests/libclang/TestUtils.h

 //===- unittests/libclang/TestUtils.h -------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_CLANG_TEST_TESTUTILS_H
 #define LLVM_CLANG_TEST_TESTUTILS_H
 
 #include "clang-c/Index.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
 
+#include "gtest/gtest.h"
 #include <fstream>
+#include <functional>
 #include <memory>
 #include <string>
 #include <vector>
-#include "gtest/gtest.h"
 
 class LibclangParseTest : public ::testing::Test {
-  std::set<std::string> Files;
+  // std::greater<> to remove files before their parent dirs in TearDown().
+  std::set<std::string, std::greater<>> Files;
   typedef std::unique_ptr<std::string> fixed_addr_string;
   std::map<fixed_addr_string, fixed_addr_string> UnsavedFileContents;
 public:
   std::string TestDir;
+  bool RemoveTestDirRecursivelyDuringTeardown = false;
   CXIndex Index;
   CXTranslationUnit ClangTU;
   unsigned TUFlags;
   std::vector<CXUnsavedFile> UnsavedFiles;
 
   void SetUp() override {
     llvm::SmallString<256> Dir;
     ASSERT_FALSE(llvm::sys::fs::createUniqueDirectory("libclang-test", Dir));
     TestDir = std::string(Dir.str());
     TUFlags = CXTranslationUnit_DetailedPreprocessingRecord |
       clang_defaultEditingTranslationUnitOptions();
     Index = clang_createIndex(0, 0);
     ClangTU = nullptr;
   }
   void TearDown() override {
     clang_disposeTranslationUnit(ClangTU);
     clang_disposeIndex(Index);
+
+    namespace fs = llvm::sys::fs;
     for (const std::string &Path : Files)
-      llvm::sys::fs::remove(Path);
-    llvm::sys::fs::remove(TestDir);
+      EXPECT_FALSE(fs::remove(Path, /*IgnoreNonExisting=*/false));
+    if (RemoveTestDirRecursivelyDuringTeardown)
+      EXPECT_FALSE(fs::remove_directories(TestDir, /*IgnoreErrors=*/false));
+    else
+      EXPECT_FALSE(fs::remove(TestDir, /*IgnoreNonExisting=*/false));
   }
   void WriteFile(std::string &Filename, const std::string &Contents) {
     if (!llvm::sys::path::is_absolute(Filename)) {
       llvm::SmallString<256> Path(TestDir);
-      llvm::sys::path::append(Path, Filename);
+      namespace path = llvm::sys::path;
+      for (auto FileI = path::begin(Filename), FileEnd = path::end(Filename);
+           FileI != FileEnd; ++FileI) {
+        ASSERT_NE(*FileI, ".");
+        path::append(Path, *FileI);
+        Files.emplace(Path.str());
+      }
       Filename = std::string(Path.str());
-      Files.insert(Filename);
     }
     llvm::sys::fs::create_directories(llvm::sys::path::parent_path(Filename));
     std::ofstream OS(Filename);
     OS << Contents;
     assert(OS.good());
   }
   void MapUnsavedFile(std::string Filename, const std::string &Contents) {
     if (!llvm::sys::path::is_absolute(Filename)) {