[clang-tidy] Set google-readability-namespace-comments.ShortNamespaceLines to 10

This value is used in cpplint, so we'd better be consistent.

llvm-svn: 222431

diff --git a/clang-tools-extra/clang-tidy/google/GoogleTidyModule.cpp b/clang-tools-extra/clang-tidy/google/GoogleTidyModule.cpp
index 16ebfe5..9734782 100644 (file)
--- a/clang-tools-extra/clang-tidy/google/GoogleTidyModule.cpp
+++ b/clang-tools-extra/clang-tidy/google/GoogleTidyModule.cpp
@@ -72,7 +72,7 @@ public:
     Opts["google-readability-braces-around-statements.ShortStatementLines"] =
         "1";
     Opts["google-readability-function-size.StatementThreshold"] = "800";
-    Opts["google-readability-namespace-comments.ShortNamespaceLines"] = "1";
+    Opts["google-readability-namespace-comments.ShortNamespaceLines"] = "10";
     Opts["google-readability-namespace-comments.SpacesBeforeComments"] = "2";
     return Options;
   }

diff --git a/clang-tools-extra/test/clang-tidy/google-module.cpp b/clang-tools-extra/test/clang-tidy/google-module.cpp
index b8c5d69..494ac48 100644 (file)
--- a/clang-tools-extra/test/clang-tidy/google-module.cpp
+++ b/clang-tools-extra/test/clang-tidy/google-module.cpp
@@ -5,6 +5,6 @@
 // CHECK: {{- key: *google-readability-function-size.StatementThreshold}}
 // CHECK-NEXT: {{value: *'800'}}
 // CHECK: {{- key: *google-readability-namespace-comments.ShortNamespaceLines}}
-// CHECK-NEXT: {{value: *'1'}}
+// CHECK-NEXT: {{value: *'10'}}
 // CHECK: {{- key: *google-readability-namespace-comments.SpacesBeforeComments}}
 // CHECK-NEXT: {{value: *'2'}}

diff --git a/clang-tools-extra/test/clang-tidy/google-readability-namespace-comments.cpp b/clang-tools-extra/test/clang-tidy/google-readability-namespace-comments.cpp
index 001e607..0a50b49 100644 (file)
--- a/clang-tools-extra/test/clang-tidy/google-readability-namespace-comments.cpp
+++ b/clang-tools-extra/test/clang-tidy/google-readability-namespace-comments.cpp
@@ -3,14 +3,28 @@
 
 namespace n1 {
 namespace n2 {
+
+
+
+
+
 // CHECK-MESSAGES: :[[@LINE+4]]:2: warning: namespace 'n2' not terminated with a closing comment [google-readability-namespace-comments]
-// CHECK-MESSAGES: :[[@LINE-2]]:11: note: namespace 'n2' starts here
+// CHECK-MESSAGES: :[[@LINE-7]]:11: note: namespace 'n2' starts here
 // CHECK-MESSAGES: :[[@LINE+3]]:2: warning: namespace 'n1' not terminated with
-// CHECK-MESSAGES: :[[@LINE-5]]:11: note: namespace 'n1' starts here
+// CHECK-MESSAGES: :[[@LINE-10]]:11: note: namespace 'n1' starts here
 }
 }
 // CHECK-FIXES: }  // namespace n2
 // CHECK-FIXES: }  // namespace n1
 
 
-namespace short1 { namespace short2 { } }
+namespace short1 {
+namespace short2 {
+// Namespaces covering 10 lines or fewer are exempt from this rule.
+
+
+
+
+
+}
+}