diff options
| author | Bruno Cardoso Lopes <bruno.cardoso@gmail.com> | 2016-05-12 04:43:27 +0000 |
|---|---|---|
| committer | Bruno Cardoso Lopes <bruno.cardoso@gmail.com> | 2016-05-12 04:43:27 +0000 |
| commit | 0a721a2d4651d7e26e2e4117ebcedc6bafd4360e (patch) | |
| tree | 876942a27d7c70d28a9075e170cd228d373e91f6 /unittests/Basic | |
| parent | 0840ba9a188d5db49419c4672f14d3f2096c328b (diff) | |
Revert "[VFS] Reapply r269100: Reconstruct the VFS overlay tree for more accurate lookup"
Reverts r269270, buildbots still failing:
http://lab.llvm.org:8011/builders/clang-x64-ninja-win7/builds/12119
http://bb.pgr.jp/builders/ninja-clang-i686-msc19-R/builds/2847
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@269276 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests/Basic')
| -rw-r--r-- | unittests/Basic/VirtualFileSystemTest.cpp | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/unittests/Basic/VirtualFileSystemTest.cpp b/unittests/Basic/VirtualFileSystemTest.cpp index f4a01ea9d1..b8e675e75f 100644 --- a/unittests/Basic/VirtualFileSystemTest.cpp +++ b/unittests/Basic/VirtualFileSystemTest.cpp @@ -1029,13 +1029,9 @@ TEST_F(VFSFromYAMLTest, DirectoryIteration) { Lower->addDirectory("//root/"); Lower->addDirectory("//root/foo"); Lower->addDirectory("//root/foo/bar"); - Lower->addDirectory("//root/zab"); - Lower->addDirectory("//root/baz"); Lower->addRegularFile("//root/foo/bar/a"); Lower->addRegularFile("//root/foo/bar/b"); Lower->addRegularFile("//root/file3"); - Lower->addRegularFile("//root/zab/a"); - Lower->addRegularFile("//root/zab/b"); IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLString("{ 'use-external-names': false,\n" " 'roots': [\n" @@ -1053,26 +1049,6 @@ TEST_F(VFSFromYAMLTest, DirectoryIteration) { " 'external-contents': '//root/foo/bar/b'\n" " }\n" " ]\n" - "},\n" - "{\n" - " 'type': 'directory',\n" - " 'name': '//root/baz/',\n" - " 'contents': [ {\n" - " 'type': 'file',\n" - " 'name': 'x',\n" - " 'external-contents': '//root/zab/a'\n" - " }\n" - " ]\n" - "},\n" - "{\n" - " 'type': 'directory',\n" - " 'name': '//root/baz/',\n" - " 'contents': [ {\n" - " 'type': 'file',\n" - " 'name': 'y',\n" - " 'external-contents': '//root/zab/b'\n" - " }\n" - " ]\n" "}\n" "]\n" "}", @@ -1085,12 +1061,8 @@ TEST_F(VFSFromYAMLTest, DirectoryIteration) { std::error_code EC; checkContents(O->dir_begin("//root/", EC), - {"//root/file1", "//root/file2", "//root/baz", "//root/file3", - "//root/foo", "//root/zab"}); + {"//root/file1", "//root/file2", "//root/file3", "//root/foo"}); checkContents(O->dir_begin("//root/foo/bar", EC), {"//root/foo/bar/a", "//root/foo/bar/b"}); - - checkContents(O->dir_begin("//root/baz/", EC), - {"//root/baz/x", "//root/baz/y"}); } |