carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 15:01:03 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge filesystem logic into FileTest and update test files. (#3183)

Browse Source 
two_files.carbon has odd STDOUT placement, but will pursue that
separately.
This commit is contained in:
Jon Ross-Perkins
2023-09-05 18:40:00 +00:00
committed by GitHub
parent de6e00c351
commit 7a1d54f8e3
9 changed files with 70 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
explorer/file_test.cpp
+3 -14
View File
@@ -27,18 +27,8 @@ class ExplorerFileTest : public FileTestBase {
}
auto Run(const llvm::SmallVector<llvm::StringRef>& test_args,
const llvm::SmallVector<TestFile>& test_files,
llvm::raw_pwrite_stream& stdout, llvm::raw_pwrite_stream& stderr)
-> ErrorOr<bool> override {
// Create the files in-memory.
llvm::vfs::InMemoryFileSystem fs;
for (const auto& test_file : test_files) {
if (!fs.addFile(test_file.filename, /*ModificationTime=*/0,
llvm::MemoryBuffer::getMemBuffer(test_file.content))) {
return ErrorBuilder() << "File is repeated: " << test_file.filename;
}
}
llvm::vfs::InMemoryFileSystem& fs, llvm::raw_pwrite_stream& stdout,
llvm::raw_pwrite_stream& stderr) -> ErrorOr<bool> override {
// Add the prelude.
llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> prelude =
llvm::MemoryBuffer::getFile("explorer/data/prelude.carbon");
@@ -66,8 +56,7 @@ class ExplorerFileTest : public FileTestBase {
return exit_code == EXIT_SUCCESS;
}
auto ValidateRun(const llvm::SmallVector<TestFile>& /*test_files*/)
-> void override {
auto ValidateRun() -> void override {
// Skip trace test check as they use stdout stream instead of
// trace_stream_ostream
if (absl::GetFlag(FLAGS_trace)) {