Sync file handling logic in RewriterTestContext.h and RefactoringTest.cpp.
They are mostly duplicated and got out of sync during the PathV1 removal. We
should factor the code somewhere, but for now a FIXME will do.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@185019 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/unittests/Tooling/RewriterTestContext.h b/unittests/Tooling/RewriterTestContext.h
index 13c4202..629ebf1 100644
--- a/unittests/Tooling/RewriterTestContext.h
+++ b/unittests/Tooling/RewriterTestContext.h
@@ -45,12 +45,7 @@
Diagnostics.setClient(&DiagnosticPrinter, false);
}
- ~RewriterTestContext() {
- if (!TemporaryDirectory.empty()) {
- uint32_t RemovedCount = 0;
- llvm::sys::fs::remove_all(TemporaryDirectory.str(), RemovedCount);
- }
- }
+ ~RewriterTestContext() {}
FileID createInMemoryFile(StringRef Name, StringRef Content) {
const llvm::MemoryBuffer *Source =
@@ -62,26 +57,25 @@
return Sources.createFileID(Entry, SourceLocation(), SrcMgr::C_User);
}
+ // FIXME: this code is mostly a duplicate of
+ // unittests/Tooling/RefactoringTest.cpp. Figure out a way to share it.
FileID createOnDiskFile(StringRef Name, StringRef Content) {
- if (TemporaryDirectory.empty()) {
- int FD;
- bool error =
- llvm::sys::fs::unique_file("rewriter-test-%%-%%-%%-%%/anchor", FD,
- TemporaryDirectory);
- assert(!error); (void)error;
- llvm::raw_fd_ostream Closer(FD, /*shouldClose=*/true);
- TemporaryDirectory = llvm::sys::path::parent_path(TemporaryDirectory);
- }
- SmallString<1024> Path(TemporaryDirectory);
- llvm::sys::path::append(Path, Name);
- std::string ErrorInfo;
- llvm::raw_fd_ostream OutStream(Path.c_str(),
- ErrorInfo, llvm::raw_fd_ostream::F_Binary);
- assert(ErrorInfo.empty());
+ SmallString<1024> Path;
+ int FD;
+ llvm::error_code EC =
+ llvm::sys::fs::unique_file(Twine(Name) + "%%%%%%", FD, Path);
+ assert(!EC);
+ (void)EC;
+
+ llvm::raw_fd_ostream OutStream(FD, true);
OutStream << Content;
OutStream.close();
const FileEntry *File = Files.getFile(Path);
assert(File != NULL);
+
+ StringRef Found = TemporaryFiles.GetOrCreateValue(Name, Path.str()).second;
+ assert(Found == Path);
+ (void)Found;
return Sources.createFileID(File, SourceLocation(), SrcMgr::C_User);
}
@@ -101,8 +95,8 @@
}
std::string getFileContentFromDisk(StringRef Name) {
- SmallString<1024> Path(TemporaryDirectory.str());
- llvm::sys::path::append(Path, Name);
+ std::string Path = TemporaryFiles.lookup(Name);
+ assert(!Path.empty());
// We need to read directly from the FileManager without relaying through
// a FileEntry, as otherwise we'd read through an already opened file
// descriptor, which might not see the changes made.
@@ -120,7 +114,7 @@
Rewriter Rewrite;
// Will be set once on disk files are generated.
- SmallString<128> TemporaryDirectory;
+ llvm::StringMap<std::string> TemporaryFiles;
};
} // end namespace clang
