improve option description and remove redundant code from tests

Author: vbvictor

clang-tools-extra/docs/clang-tidy/checks/cppcoreguidelines/avoid-goto.rst

@@ -57,5 +57,5 @@ Options
 
 .. option:: IgnoreMacros
 
-   If set to `true`, the check will not warn if ``goto`` statement is placed
-   inside a macro. Default is `false`.
+   If set to `true`, the check will not warn if a ``goto`` statement is
+   expanded from a macro. Default is `false`.

clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/avoid-goto.cpp

@@ -1,15 +1,13 @@
-// RUN: %check_clang_tidy %s cppcoreguidelines-avoid-goto %t
-// RUN: %check_clang_tidy -check-suffix=MACRO %s cppcoreguidelines-avoid-goto %t -- -config="{CheckOptions: { cppcoreguidelines-avoid-goto.IgnoreMacros: true }}"
+// RUN: %check_clang_tidy -check-suffix=,MACRO %s cppcoreguidelines-avoid-goto %t
+// RUN: %check_clang_tidy %s cppcoreguidelines-avoid-goto %t -- -config="{CheckOptions: { cppcoreguidelines-avoid-goto.IgnoreMacros: true }}"
 
 void noop() {}
 
 int main() {
   noop();
   goto jump_to_me;
   // CHECK-MESSAGES: [[@LINE-1]]:3: warning: avoid using 'goto' for flow control
-  // CHECK-MESSAGES: [[@LINE+5]]:1: note: label defined here
-  // CHECK-MESSAGES-MACRO: [[@LINE-3]]:3: warning: avoid using 'goto' for flow control
-  // CHECK-MESSAGES-MACRO: [[@LINE+3]]:1: note: label defined here
+  // CHECK-MESSAGES: [[@LINE+3]]:1: note: label defined here
   noop();
 
 jump_to_me:;
@@ -19,16 +17,12 @@ jump_backwards:;
   goto jump_backwards;
   // CHECK-MESSAGES: [[@LINE-1]]:3: warning: avoid using 'goto' for flow control
   // CHECK-MESSAGES: [[@LINE-4]]:1: note: label defined here
-  // CHECK-MESSAGES-MACRO: [[@LINE-3]]:3: warning: avoid using 'goto' for flow control
-  // CHECK-MESSAGES-MACRO: [[@LINE-6]]:1: note: label defined here
 
   goto jump_in_line;
   ;
 jump_in_line:;
   // CHECK-MESSAGES: [[@LINE-3]]:3: warning: avoid using 'goto' for flow control
   // CHECK-MESSAGES: [[@LINE-2]]:1: note: label defined here
-  // CHECK-MESSAGES-MACRO: [[@LINE-5]]:3: warning: avoid using 'goto' for flow control
-  // CHECK-MESSAGES-MACRO: [[@LINE-4]]:1: note: label defined here
 
   // Test the GNU extension https://gcc.gnu.org/onlinedocs/gcc/Labels-as-Values.html
 some_label:;
@@ -141,8 +135,6 @@ void jump_out_backwards() {
         goto before_the_loop;
       // CHECK-MESSAGES: [[@LINE-1]]:9: warning: avoid using 'goto' for flow control
       // CHECK-MESSAGES: [[@LINE-8]]:1: note: label defined here
-      // CHECK-MESSAGES-MACRO: [[@LINE-3]]:9: warning: avoid using 'goto' for flow control
-      // CHECK-MESSAGES-MACRO: [[@LINE-10]]:1: note: label defined here
     }
   }
 }
@@ -158,26 +150,24 @@ jump_to_me:; \
 
 void inside_macro_all() {
   macro_goto_code
-  // CHECK-MESSAGES: [[@LINE-1]]:3: warning: avoid using 'goto' for flow control
-  // CHECK-MESSAGES: [[@LINE-2]]:3: note: label defined here
+  // CHECK-MESSAGES-MACRO: [[@LINE-1]]:3: warning: avoid using 'goto' for flow control
+  // CHECK-MESSAGES-MACRO: [[@LINE-2]]:3: note: label defined here
 }
 
 void inside_macro_label() {
   noop();
   goto jump_to_me;
   // CHECK-MESSAGES: [[@LINE-1]]:3: warning: avoid using 'goto' for flow control
-  // CHECK-MESSAGES: [[@LINE+4]]:3: note: label defined here
-  // CHECK-MESSAGES-MACRO: [[@LINE-3]]:3: warning: avoid using 'goto' for flow control
-  // CHECK-MESSAGES-MACRO: [[@LINE+2]]:3: note: label defined here
+  // CHECK-MESSAGES: [[@LINE+2]]:3: note: label defined here
   noop();
   macro_goto_label
 }
 
 void inside_macro_goto() {
   noop();
   macro_goto_jump
-  // CHECK-MESSAGES: [[@LINE-1]]:3: warning: avoid using 'goto' for flow control
-  // CHECK-MESSAGES: [[@LINE+2]]:3: note: label defined here
+  // CHECK-MESSAGES-MACRO: [[@LINE-1]]:3: warning: avoid using 'goto' for flow control
+  // CHECK-MESSAGES-MACRO: [[@LINE+2]]:3: note: label defined here
   noop();
   jump_to_me:;
 }