diff options
author | Juergen Ributzka <juergen@apple.com> | 2017-03-10 21:46:51 +0000 |
---|---|---|
committer | Juergen Ributzka <juergen@apple.com> | 2017-03-10 21:46:51 +0000 |
commit | 69cd1ea6d6a9dbad1d702577d618d73a82160f15 (patch) | |
tree | 795336336230e744ba0fbd1e95928071f9be7fa9 /unittests/Basic | |
parent | 57f2628a98c28b87e414fa925315a1d066987232 (diff) |
Revert r297510 "[VFS] Ignore broken symlinks in the directory iterator."
The tests are failing on one of the bots.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@297517 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests/Basic')
-rw-r--r-- | unittests/Basic/VirtualFileSystemTest.cpp | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/unittests/Basic/VirtualFileSystemTest.cpp b/unittests/Basic/VirtualFileSystemTest.cpp index 738e25b2b0..580343d93e 100644 --- a/unittests/Basic/VirtualFileSystemTest.cpp +++ b/unittests/Basic/VirtualFileSystemTest.cpp @@ -305,22 +305,6 @@ struct ScopedDir { } operator StringRef() { return Path.str(); } }; - -struct ScopedLink { - SmallString<128> Path; - ScopedLink(const Twine &To, const Twine &From) { - Path = From.str(); - std::error_code EC = sys::fs::create_link(To, From); - if (EC) - Path = ""; - EXPECT_FALSE(EC); - } - ~ScopedLink() { - if (Path != "") - EXPECT_FALSE(llvm::sys::fs::remove(Path.str())); - } - operator StringRef() { return Path.str(); } -}; } // end anonymous namespace TEST(VirtualFileSystemTest, BasicRealFSIteration) { @@ -350,35 +334,6 @@ TEST(VirtualFileSystemTest, BasicRealFSIteration) { EXPECT_EQ(vfs::directory_iterator(), I); } -TEST(VirtualFileSystemTest, BrokenSymlinkRealFSIteration) { - ScopedDir TestDirectory("virtual-file-system-test", /*Unique*/ true); - IntrusiveRefCntPtr<vfs::FileSystem> FS = vfs::getRealFileSystem(); - - ScopedLink _a("no_such_file", TestDirectory + "/a"); - ScopedDir _b(TestDirectory + "/b"); - ScopedLink _c("no_such_file", TestDirectory + "/c"); - - std::error_code EC; - vfs::directory_iterator I = FS->dir_begin(Twine(TestDirectory), EC); - EXPECT_TRUE(EC); - EXPECT_NE(vfs::directory_iterator(), I); - EC = std::error_code(); - EXPECT_TRUE(I->getName() == _a); - I.increment(EC); - EXPECT_FALSE(EC); - EXPECT_NE(vfs::directory_iterator(), I); - EXPECT_TRUE(I->getName() == _b); - I.increment(EC); - EXPECT_TRUE(EC); - EXPECT_NE(vfs::directory_iterator(), I); - EC = std::error_code(); - EXPECT_NE(vfs::directory_iterator(), I); - EXPECT_TRUE(I->getName() == _c); - I.increment(EC); - EXPECT_FALSE(EC); - EXPECT_EQ(vfs::directory_iterator(), I); -} - TEST(VirtualFileSystemTest, BasicRealFSRecursiveIteration) { ScopedDir TestDirectory("virtual-file-system-test", /*Unique*/true); IntrusiveRefCntPtr<vfs::FileSystem> FS = vfs::getRealFileSystem(); @@ -418,44 +373,6 @@ TEST(VirtualFileSystemTest, BasicRealFSRecursiveIteration) { EXPECT_EQ(1, Counts[3]); // d } -TEST(VirtualFileSystemTest, BrokenSymlinkRealFSRecursiveIteration) { - ScopedDir TestDirectory("virtual-file-system-test", /*Unique*/ true); - IntrusiveRefCntPtr<vfs::FileSystem> FS = vfs::getRealFileSystem(); - - ScopedLink _a("no_such_file", TestDirectory + "/a"); - ScopedDir _b(TestDirectory + "/b"); - ScopedLink _ba("no_such_file", TestDirectory + "/b/a"); - ScopedDir _bb(TestDirectory + "/b/b"); - ScopedLink _bc("no_such_file", TestDirectory + "/b/c"); - ScopedLink _c("no_such_file", TestDirectory + "/c"); - ScopedDir _d(TestDirectory + "/d"); - ScopedDir _dd(TestDirectory + "/d/d"); - ScopedDir _ddd(TestDirectory + "/d/d/d"); - ScopedLink _e("no_such_file", TestDirectory + "/e"); - - std::vector<std::string> Contents; - std::error_code EC; - for (vfs::recursive_directory_iterator I(*FS, Twine(TestDirectory), EC), E; - I != E; I.increment(EC)) { - // Skip broken symlinks. - if (EC == std::errc::no_such_file_or_directory) { - EC = std::error_code(); - continue; - } else if (EC) { - break; - } - Contents.push_back(I->getName()); - } - - // Check contents. - EXPECT_EQ(5U, Contents.size()); - EXPECT_TRUE(Contents[0] == _b); - EXPECT_TRUE(Contents[1] == _bb); - EXPECT_TRUE(Contents[2] == _d); - EXPECT_TRUE(Contents[3] == _dd); - EXPECT_TRUE(Contents[4] == _ddd); -} - template <typename DirIter> static void checkContents(DirIter I, ArrayRef<StringRef> ExpectedOut) { std::error_code EC; |