diff options
author | Sean Silva <chisophugis@gmail.com> | 2016-05-11 04:04:59 +0000 |
---|---|---|
committer | Sean Silva <chisophugis@gmail.com> | 2016-05-11 04:04:59 +0000 |
commit | 4e683f9a2befcd70610ad938b2a42d7cf3d60c10 (patch) | |
tree | 1a4d92dd2dfef0c120ef597fc68e92788eefd2b9 /unittests/Basic | |
parent | ddc91cf1727ad03fcd091578a23c2bcde55b0761 (diff) |
Hopefully bring llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast back to life
Bruno made a couple valiant attempts but the bot is still red.
This reverts r269100 (primary commit), r269108 (fix attempt), r269133
(fix attempt).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@269160 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests/Basic')
-rw-r--r-- | unittests/Basic/VirtualFileSystemTest.cpp | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/unittests/Basic/VirtualFileSystemTest.cpp b/unittests/Basic/VirtualFileSystemTest.cpp index 580e298abd..d2f4a7d8f0 100644 --- a/unittests/Basic/VirtualFileSystemTest.cpp +++ b/unittests/Basic/VirtualFileSystemTest.cpp @@ -1022,14 +1022,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"); - Lower->addRegularFile("//root/baz/c"); IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLString("{ 'use-external-names': false,\n" " 'roots': [\n" @@ -1047,26 +1042,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" "}", @@ -1079,12 +1054,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", "//root/baz/c"}); } |