Author: Kadir Cetinkaya Date: 2020-11-17T14:54:10+01:00 New Revision: 5a9f3867046c4e1c97760e22a505f4d1d788417e
URL: https://github.com/llvm/llvm-project/commit/5a9f3867046c4e1c97760e22a505f4d1d788417e DIFF: https://github.com/llvm/llvm-project/commit/5a9f3867046c4e1c97760e22a505f4d1d788417e.diff LOG: [clang-tidy] Make clang-format and include-order-check coherent LLVM style puts both gtest and gmock to the end of the include list. But llvm-include-order-check was only moving gtest headers to the end, resulting in a false tidy-warning. Differential Revision: https://reviews.llvm.org/D91602 Added: clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/gmock/foo.h Modified: clang-tools-extra/clang-tidy/llvm/IncludeOrderCheck.cpp clang-tools-extra/test/clang-tidy/checkers/llvm-include-order.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/clang-tidy/llvm/IncludeOrderCheck.cpp b/clang-tools-extra/clang-tidy/llvm/IncludeOrderCheck.cpp index 834a49a51d60..c962fb3bc25b 100644 --- a/clang-tools-extra/clang-tidy/llvm/IncludeOrderCheck.cpp +++ b/clang-tools-extra/clang-tidy/llvm/IncludeOrderCheck.cpp @@ -67,7 +67,8 @@ static int getPriority(StringRef Filename, bool IsAngled, bool IsMainModule) { return 2; // System headers are sorted to the end. - if (IsAngled || Filename.startswith("gtest/")) + if (IsAngled || Filename.startswith("gtest/") || + Filename.startswith("gmock/")) return 3; // Other headers are inserted between the main module header and LLVM headers. diff --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/gmock/foo.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/gmock/foo.h new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/clang-tools-extra/test/clang-tidy/checkers/llvm-include-order.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvm-include-order.cpp index 7272353bedcb..6dd3d6ace458 100644 --- a/clang-tools-extra/test/clang-tidy/checkers/llvm-include-order.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/llvm-include-order.cpp @@ -3,6 +3,7 @@ // CHECK-MESSAGES: [[@LINE+2]]:1: warning: #includes are not sorted properly #include "j.h" #include "gtest/foo.h" +#include "gmock/foo.h" #include "i.h" #include <s.h> #include "llvm/a.h" @@ -16,6 +17,7 @@ // CHECK-FIXES-NEXT: #include "clang/b.h" // CHECK-FIXES-NEXT: #include "llvm-c/d.h" // -c // CHECK-FIXES-NEXT: #include "llvm/a.h" +// CHECK-FIXES-NEXT: #include "gmock/foo.h" // CHECK-FIXES-NEXT: #include "gtest/foo.h" // CHECK-FIXES-NEXT: #include <s.h> _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits