diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Basic/VirtualFileSystem.cpp | 2 | ||||
| -rw-r--r-- | clang/unittests/Basic/VirtualFileSystemTest.cpp | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/clang/lib/Basic/VirtualFileSystem.cpp b/clang/lib/Basic/VirtualFileSystem.cpp index 5486331d4af..b3805b2ff92 100644 --- a/clang/lib/Basic/VirtualFileSystem.cpp +++ b/clang/lib/Basic/VirtualFileSystem.cpp @@ -501,7 +501,7 @@ void InMemoryFileSystem::addFile(const Twine &P, time_t ModificationTime, if (I == E) { // End of the path, create a new file. // FIXME: expose the status details in the interface. - Status Stat(Path, getNextVirtualUniqueID(), + Status Stat(P.str(), getNextVirtualUniqueID(), llvm::sys::TimeValue(ModificationTime, 0), 0, 0, Buffer->getBufferSize(), llvm::sys::fs::file_type::regular_file, diff --git a/clang/unittests/Basic/VirtualFileSystemTest.cpp b/clang/unittests/Basic/VirtualFileSystemTest.cpp index 0b767dd0c8d..005737e9de3 100644 --- a/clang/unittests/Basic/VirtualFileSystemTest.cpp +++ b/clang/unittests/Basic/VirtualFileSystemTest.cpp @@ -602,6 +602,19 @@ TEST_F(InMemoryFileSystemTest, DirectoryIteration) { ASSERT_EQ(vfs::directory_iterator(), I); } +TEST_F(InMemoryFileSystemTest, WorkingDirectory) { + FS.setCurrentWorkingDirectory("/b"); + FS.addFile("c", 0, MemoryBuffer::getMemBuffer("")); + + auto Stat = FS.status("/b/c"); + ASSERT_FALSE(Stat.getError()) << Stat.getError() << "\n" << FS.toString(); + ASSERT_EQ("c", Stat->getName()); + ASSERT_EQ("/b", *FS.getCurrentWorkingDirectory()); + + Stat = FS.status("c"); + ASSERT_FALSE(Stat.getError()) << Stat.getError() << "\n" << FS.toString(); +} + // NOTE: in the tests below, we use '//root/' as our root directory, since it is // a legal *absolute* path on Windows as well as *nix. class VFSFromYAMLTest : public ::testing::Test { |
