forked from OSchip/llvm-project
[clang-tidy] Make llvm-header-guard work on llvm git monorepo
Reviewers: gribozavr Reviewed By: gribozavr Subscribers: xazax.hun, ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, usaxena95, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D68026 llvm-svn: 372953
This commit is contained in:
parent
8865ebb509
commit
0d808e5064
|
@ -33,6 +33,13 @@ std::string LLVMHeaderGuardCheck::getHeaderGuard(StringRef Filename,
|
|||
if (PosToolsClang != StringRef::npos)
|
||||
Guard = Guard.substr(PosToolsClang + std::strlen("tools/"));
|
||||
|
||||
// Unlike LLVM svn, LLVM git monorepo is named llvm-project, so we replace
|
||||
// "/llvm-project/" with the cannonical "/llvm/".
|
||||
const static StringRef LLVMProject = "/llvm-project/";
|
||||
size_t PosLLVMProject = Guard.rfind(LLVMProject);
|
||||
if (PosLLVMProject != StringRef::npos)
|
||||
Guard = Guard.replace(PosLLVMProject, LLVMProject.size(), "/llvm/");
|
||||
|
||||
// The remainder is LLVM_FULL_PATH_TO_HEADER_H
|
||||
size_t PosLLVM = Guard.rfind("llvm/");
|
||||
if (PosLLVM != StringRef::npos)
|
||||
|
|
|
@ -211,6 +211,15 @@ TEST(LLVMHeaderGuardCheckTest, FixHeaderGuards) {
|
|||
"#endif /* LLVM_ADT_FOO_H\\ \n"
|
||||
" FOO */",
|
||||
"include/llvm/ADT/foo.h", None));
|
||||
|
||||
EXPECT_EQ("#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_FOO_H\n"
|
||||
"#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_FOO_H\n"
|
||||
"\n"
|
||||
"\n"
|
||||
"#endif\n",
|
||||
runHeaderGuardCheck(
|
||||
"", "/llvm-project/clang-tools-extra/clangd/foo.h",
|
||||
StringRef("header is missing header guard")));
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue