maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[clangd] testPath's final result agrees with the passed in Style" 

This reverts commit 8cec8de2a4 as it
breaks windows buildbots.
This commit is contained in:
Kadir Cetinkaya 2020-11-23 13:12:35 +01:00
parent 677e94c0f0
commit 61e538b15d
No known key found for this signature in database
GPG Key ID: E39E36B8D2057ED6
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang-tools-extra/clangd/unittests/ConfigCompileTests.cpp
View File

@ -255,6 +255,7 @@ TEST_F(ConfigCompileTests, ExternalBlockMountPoint) {
};
auto BarPath = testPath("foo/bar.h", llvm::sys::path::Style::posix);
BarPath = llvm::sys::path::convert_to_slash(BarPath);
Parm.Path = BarPath;
// Non-absolute MountPoint without a directory raises an error.
Frag = GetFrag("", "foo");
@ -268,6 +269,7 @@ TEST_F(ConfigCompileTests, ExternalBlockMountPoint) {
ASSERT_FALSE(Conf.Index.External);
auto FooPath = testPath("foo/", llvm::sys::path::Style::posix);
FooPath = llvm::sys::path::convert_to_slash(FooPath);
// Ok when relative.
Frag = GetFrag(testRoot(), "foo/");
compileAndApply();
@ -291,6 +293,7 @@ TEST_F(ConfigCompileTests, ExternalBlockMountPoint) {
// File outside MountPoint, no index.
auto BazPath = testPath("bar/baz.h", llvm::sys::path::Style::posix);
BazPath = llvm::sys::path::convert_to_slash(BazPath);
Parm.Path = BazPath;
Frag = GetFrag("", FooPath.c_str());
compileAndApply();
@ -299,6 +302,7 @@ TEST_F(ConfigCompileTests, ExternalBlockMountPoint) {
// File under MountPoint, index should be set.
BazPath = testPath("foo/baz.h", llvm::sys::path::Style::posix);
BazPath = llvm::sys::path::convert_to_slash(BazPath);
Parm.Path = BazPath;
Frag = GetFrag("", FooPath.c_str());
compileAndApply();

8
clang-tools-extra/clangd/unittests/TestFS.cpp
View File

@ -80,10 +80,12 @@ const char *testRoot() {
}
std::string testPath(PathRef File, llvm::sys::path::Style Style) {
assert(llvm::sys::path::is_relative(File, Style));
assert(llvm::sys::path::is_relative(File) && "FileName should be relative");
llvm::SmallString<32> NativeFile = File;
llvm::sys::path::native(NativeFile, Style);
llvm::SmallString<32> Path;
llvm::sys::path::append(Path, testRoot(), File);
llvm::sys::path::native(Path, Style);
llvm::sys::path::append(Path, Style, testRoot(), NativeFile);
return std::string(Path.str());
}