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

Add vfs support to toolchain. (#2888)

Browse Source 
This adds vfs support to the toolchain, allowing Driver to take in-memory inputs in tests. As a consequence, I'm simplifying SourceBuffer: rather than allowing tests to pass in their own memory buffer, I'm using InMemoryFileSystem to push for greater consistency with production code. This does hit a quirk where I need to be careful about null terminator handling because fuzzer imports don't always have one, but that's probably more robust anyways.

Co-authored-by: Richard Smith <richard@metafoo.co.uk>
This commit is contained in:
Jon Ross-Perkins
2023-06-12 13:19:57 -07:00
committed by GitHub
co-authored by Richard Smith
parent 2c45cb3be8
commit a93e621488
17 changed files with 217 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/source/source_buffer_test.cpp
+40 -50
View File
@@ -7,68 +7,58 @@
#include <gtest/gtest.h>
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/Twine.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/VirtualFileSystem.h"
#include "llvm/Support/raw_ostream.h"
namespace Carbon::Testing {
namespace {
TEST(SourceBufferTest, StringRep) {
auto buffer = SourceBuffer::CreateFromText(llvm::Twine("Hello") + " World");
EXPECT_EQ("/text", buffer->filename());
static constexpr llvm::StringLiteral TestFileName = "test.carbon";
TEST(SourceBufferTest, MissingFile) {
llvm::vfs::InMemoryFileSystem fs;
auto buffer = SourceBuffer::CreateFromFile(fs, TestFileName);
EXPECT_FALSE(buffer.ok());
}
TEST(SourceBufferTest, SimpleFile) {
llvm::vfs::InMemoryFileSystem fs;
CARBON_CHECK(fs.addFile(TestFileName, /*ModificationTime=*/0,
llvm::MemoryBuffer::getMemBuffer("Hello World")));
auto buffer = SourceBuffer::CreateFromFile(fs, TestFileName);
ASSERT_TRUE(buffer.ok()) << "Error message: " << buffer.error();
EXPECT_EQ(TestFileName, buffer->filename());
EXPECT_EQ("Hello World", buffer->text());
}
TEST(SourceBufferText, StringRepWithFilename) {
// Give a custom filename.
auto buffer =
SourceBuffer::CreateFromText("Hello World Again!", "/custom/text");
EXPECT_EQ("/custom/text", buffer->filename());
EXPECT_EQ("Hello World Again!", buffer->text());
TEST(SourceBufferTest, NoNull) {
llvm::vfs::InMemoryFileSystem fs;
static constexpr char NoNull[3] = {'a', 'b', 'c'};
CARBON_CHECK(fs.addFile(
TestFileName, /*ModificationTime=*/0,
llvm::MemoryBuffer::getMemBuffer(llvm::StringRef(NoNull, sizeof(NoNull)),
/*BufferName=*/"",
/*RequiresNullTerminator=*/false)));
auto buffer = SourceBuffer::CreateFromFile(fs, TestFileName);
ASSERT_TRUE(buffer.ok()) << "Error message: " << buffer.error();
EXPECT_EQ(TestFileName, buffer->filename());
EXPECT_EQ("abc", buffer->text());
}
auto CreateTestFile(llvm::StringRef text) -> std::string {
int fd = -1;
llvm::SmallString<1024> path;
auto error_code =
llvm::sys::fs::createTemporaryFile("test_file", ".txt", fd, path);
if (error_code) {
llvm::report_fatal_error(llvm::Twine("Failed to create temporary file: ") +
error_code.message());
}
TEST(SourceBufferTest, EmptyFile) {
llvm::vfs::InMemoryFileSystem fs;
CARBON_CHECK(fs.addFile(TestFileName, /*ModificationTime=*/0,
llvm::MemoryBuffer::getMemBuffer("")));
llvm::raw_fd_ostream out_stream(fd, /*shouldClose=*/true);
out_stream << text;
out_stream.close();
auto buffer = SourceBuffer::CreateFromFile(fs, TestFileName);
ASSERT_TRUE(buffer.ok()) << "Error message: " << buffer.error();
return path.str().str();
}
TEST(SourceBufferTest, FileRep) {
auto test_file_path = CreateTestFile("Hello World");
auto expected_buffer = SourceBuffer::CreateFromFile(test_file_path);
ASSERT_TRUE(static_cast<bool>(expected_buffer))
<< "Error message: " << toString(expected_buffer.takeError());
SourceBuffer& buffer = *expected_buffer;
EXPECT_EQ(test_file_path, buffer.filename());
EXPECT_EQ("Hello World", buffer.text());
}
TEST(SourceBufferTest, FileRepEmpty) {
auto test_file_path = CreateTestFile("");
auto expected_buffer = SourceBuffer::CreateFromFile(test_file_path);
ASSERT_TRUE(static_cast<bool>(expected_buffer))
<< "Error message: " << toString(expected_buffer.takeError());
SourceBuffer& buffer = *expected_buffer;
EXPECT_EQ(test_file_path, buffer.filename());
EXPECT_EQ("", buffer.text());
EXPECT_EQ(TestFileName, buffer->filename());
EXPECT_EQ("", buffer->text());
}
} // namespace