llvmbot wrote:

<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-clang-tidy

Author: Nicolas van Kempen (nicovank)

<details>
<summary>Changes</summary>


See Discourse post here:
https://discourse.llvm.org/t/rfc-using-match-full-lines-in-clang-tidy-tests/85553

I've added `--match-partial-fixes` to all tests that were failing, unless I 
noticed the fix was quick and trivial. I'll do a second pass after this lands 
to update more tests.


---

Patch is 81.99 KiB, truncated to 20.00 KiB below, full version: 
https://github.com/llvm/llvm-project/pull/133756.diff


97 Files Affected:

- (modified) clang-tools-extra/docs/ReleaseNotes.rst (+6) 
- (modified) clang-tools-extra/test/clang-tidy/check_clang_tidy.py (+15-9) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/abseil/duration-addition.cpp (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/abseil/duration-comparison.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/abseil/duration-conversion-cast.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/abseil/duration-factory-float.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/abseil/duration-factory-scale.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/abseil/duration-subtraction.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/abseil/duration-unnecessary-conversion.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/abseil/redundant-strcat-calls.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/abseil/time-comparison.cpp (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/abseil/time-subtraction.cpp (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/abseil/upgrade-duration-conversions.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/altera/struct-pack-align.cpp (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/android/cloexec-memfd-create.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/android/cloexec-open.cpp (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/android/cloexec-socket.cpp (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/bugprone/incorrect-enable-shared-from-this.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/bugprone/move-forwarding-reference.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-in-initialization-strlen.c
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-safe-cxx.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-strlen.c
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-wcslen.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/bugprone/posix-return.cpp (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/bugprone/standalone-empty.cpp 
(+22-22) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/bugprone/stringview-nullptr.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-string-compare.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/bugprone/swapped-arguments.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-constant-array-index.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init-use-assignment.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/virtual-class-destructor.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/google/build-explicit-make-pair.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/google/objc-avoid-nsobject-new.m 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/google/upgrade-googletest-case.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/llvm/prefer-isa-or-dyn-cast-in-conditionals.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/llvm/prefer-register-over-unsigned.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/llvm/prefer-register-over-unsigned2.cpp
 (+2-2) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/llvm/prefer-register-over-unsigned3.cpp
 (+3-3) 
- (modified) clang-tools-extra/test/clang-tidy/checkers/llvm/twine-local.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-pointer-as-pointers.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-pointer-as-values.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-templates.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-values-before-cxx23.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-values.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/misc/definitions-in-headers.hpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters.cpp (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/avoid-bind.cpp (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/concat-nested-namespaces.cpp
 (+2-2) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-camelback.cpp 
(+3-3) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-const.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-extra.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-lowercase.cpp 
(+4-4) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-rewritten-binop.cpp
 (+2-2) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-uppercase.cpp 
(+4-4) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/make-shared.cpp (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique.cpp (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/min-max-use-initializer-list.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/pass-by-value.cpp (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/redundant-void-arg.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/replace-auto-ptr.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/type-traits.cpp (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-cast-remove-stars.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-cast.cpp (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-for-pointer.cpp 
(+2-2) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-iterator.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-min-type-name-length.cpp
 (+4-4) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default-copy.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/use-integer-sign-comparison-qt.cpp
 (+3-2) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/use-integer-sign-comparison.cpp
 (+2-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/use-nullptr.cpp (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/use-override.cpp (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/use-starts-ends-with.cpp 
(+7-7) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-format-fmt.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-format.cpp (+2-2) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print.cpp (+2-2) 
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/use-using.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/performance/faster-string-find.cpp 
(+2-2) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/performance/for-range-copy.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/performance/noexcept-move-constructor-fix.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-copy-initialization.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-delayed.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/readability/const-return-type.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/readability/container-size-empty.cpp 
(+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/readability/implicit-bool-conversion.c
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/readability/implicit-bool-conversion.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/readability/math-missing-parentheses.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/readability/simplify-boolean-expr-members.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/readability/simplify-boolean-expr.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer-custom-list.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/infrastructure/duplicate-conflicted-fixes-of-alias-checkers.cpp
 (+1-1) 
- (modified) 
clang-tools-extra/test/clang-tidy/infrastructure/duplicate-fixes-of-alias-checkers.cpp
 (+1-1) 


``````````diff
diff --git a/clang-tools-extra/docs/ReleaseNotes.rst 
b/clang-tools-extra/docs/ReleaseNotes.rst
index 6cb8d572d3a78..91c98fa9f0acd 100644
--- a/clang-tools-extra/docs/ReleaseNotes.rst
+++ b/clang-tools-extra/docs/ReleaseNotes.rst
@@ -91,6 +91,12 @@ Improvements to clang-query
 Improvements to clang-tidy
 --------------------------
 
+- Changed the :program:`check_clang_tidy.py` tool to use FileCheck's
+  ``--match-full-lines`` instead of ``strict-whitespace`` for ``CHECK-FIXES``
+  clauses. Added a ``--match-partial-fixes`` option to keep previous behavior 
on
+  specific tests. This may break tests for users with custom out-of-tree checks
+  who use :program:`check_clang_tidy.py` as-is.
+
 - Improved :program:`clang-tidy-diff.py` script. Add the `-warnings-as-errors`
   argument to treat warnings as errors.
 
diff --git a/clang-tools-extra/test/clang-tidy/check_clang_tidy.py 
b/clang-tools-extra/test/clang-tidy/check_clang_tidy.py
index 93c49566a90e3..f65e880723fbd 100755
--- a/clang-tools-extra/test/clang-tidy/check_clang_tidy.py
+++ b/clang-tools-extra/test/clang-tidy/check_clang_tidy.py
@@ -105,6 +105,7 @@ def __init__(self, args: argparse.Namespace, extra_args: 
List[str]) -> None:
         self.fixes = MessagePrefix("CHECK-FIXES")
         self.messages = MessagePrefix("CHECK-MESSAGES")
         self.notes = MessagePrefix("CHECK-NOTES")
+        self.match_partial_fixes = args.match_partial_fixes
 
         file_name_with_extension = self.assume_file_name or 
self.input_file_name
         _, extension = os.path.splitext(file_name_with_extension)
@@ -245,15 +246,15 @@ def check_no_diagnosis(self, clang_tidy_output: str) -> 
None:
 
     def check_fixes(self) -> None:
         if self.has_check_fixes:
-            try_run(
-                [
-                    "FileCheck",
-                    "-input-file=" + self.temp_file_name,
-                    self.input_file_name,
-                    "-check-prefixes=" + ",".join(self.fixes.prefixes),
-                    "-strict-whitespace",
-                ]
-            )
+            command = [
+                "FileCheck",
+                "--input-file=" + self.temp_file_name,
+                self.input_file_name,
+                "--check-prefixes=" + ",".join(self.fixes.prefixes),
+            ]
+            if not self.match_partial_fixes:
+                command.append("--match-full-lines")
+            try_run(command)
 
     def check_messages(self, clang_tidy_output: str) -> None:
         if self.has_check_messages:
@@ -372,6 +373,11 @@ def parse_arguments() -> Tuple[argparse.Namespace, 
List[str]]:
         default=["c++11-or-later"],
         help="Passed to clang. Special -or-later values are expanded.",
     )
+    parser.add_argument(
+        "--match-partial-fixes",
+        action="store_true",
+        help="allow partial line matches for fixes"
+    )
     return parser.parse_known_args()
 
 
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-addition.cpp 
b/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-addition.cpp
index 33cfc58fef3c6..562b513d784e6 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-addition.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-addition.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s abseil-duration-addition %t -- -- -I%S/Inputs
+// RUN: %check_clang_tidy --match-partial-fixes %s abseil-duration-addition %t 
-- -- -I%S/Inputs
 
 #include "absl/time/time.h"
 
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-comparison.cpp 
b/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-comparison.cpp
index 9fa422bec05ab..6110dfded6bac 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-comparison.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-comparison.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s abseil-duration-comparison %t -- -- -I%S/Inputs
+// RUN: %check_clang_tidy --match-partial-fixes %s abseil-duration-comparison 
%t -- -- -I%S/Inputs
 
 #include "absl/time/time.h"
 
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-conversion-cast.cpp
 
b/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-conversion-cast.cpp
index 0c2a9d791f1d1..368b9d63e0ec7 100644
--- 
a/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-conversion-cast.cpp
+++ 
b/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-conversion-cast.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s abseil-duration-conversion-cast %t -- -- 
-I%S/Inputs
+// RUN: %check_clang_tidy --match-partial-fixes %s 
abseil-duration-conversion-cast %t -- -- -I%S/Inputs
 
 #include "absl/time/time.h"
 
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-factory-float.cpp 
b/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-factory-float.cpp
index 2649d2b90d8e6..2f38dbfe9778d 100644
--- 
a/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-factory-float.cpp
+++ 
b/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-factory-float.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s abseil-duration-factory-float %t -- -- -I%S/Inputs
+// RUN: %check_clang_tidy --match-partial-fixes %s 
abseil-duration-factory-float %t -- -- -I%S/Inputs
 
 #include "absl/time/time.h"
 
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-factory-scale.cpp 
b/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-factory-scale.cpp
index 04c361328f5da..dd5f808f5a4c3 100644
--- 
a/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-factory-scale.cpp
+++ 
b/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-factory-scale.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s abseil-duration-factory-scale %t -- -- -I%S/Inputs
+// RUN: %check_clang_tidy --match-partial-fixes %s 
abseil-duration-factory-scale %t -- -- -I%S/Inputs
 
 #include "absl/time/time.h"
 
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-subtraction.cpp 
b/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-subtraction.cpp
index bd6f3172d7779..167258e32599d 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-subtraction.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-subtraction.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s abseil-duration-subtraction %t -- -- -I %S/Inputs
+// RUN: %check_clang_tidy --match-partial-fixes %s abseil-duration-subtraction 
%t -- -- -I %S/Inputs
 
 #include "absl/time/time.h"
 
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-unnecessary-conversion.cpp
 
b/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-unnecessary-conversion.cpp
index 9730f6b29b1f9..f4c69c5adc440 100644
--- 
a/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-unnecessary-conversion.cpp
+++ 
b/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-unnecessary-conversion.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy -std=c++11-or-later %s 
abseil-duration-unnecessary-conversion %t -- -- -I %S/Inputs
+// RUN: %check_clang_tidy --match-partial-fixes -std=c++11-or-later %s 
abseil-duration-unnecessary-conversion %t -- -- -I %S/Inputs
 
 #include "absl/time/time.h"
 
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/abseil/redundant-strcat-calls.cpp 
b/clang-tools-extra/test/clang-tidy/checkers/abseil/redundant-strcat-calls.cpp
index dbd354b132e2f..b5e866c3043fd 100644
--- 
a/clang-tools-extra/test/clang-tidy/checkers/abseil/redundant-strcat-calls.cpp
+++ 
b/clang-tools-extra/test/clang-tidy/checkers/abseil/redundant-strcat-calls.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s abseil-redundant-strcat-calls %t -- -- -isystem 
%clang_tidy_headers
+// RUN: %check_clang_tidy --match-partial-fixes %s 
abseil-redundant-strcat-calls %t -- -- -isystem %clang_tidy_headers
 #include <string>
 
 namespace absl {
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/abseil/time-comparison.cpp 
b/clang-tools-extra/test/clang-tidy/checkers/abseil/time-comparison.cpp
index ab03020c3c778..4de43ec56436e 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/abseil/time-comparison.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil/time-comparison.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s abseil-time-comparison %t -- -- -I%S/Inputs
+// RUN: %check_clang_tidy --match-partial-fixes %s abseil-time-comparison %t 
-- -- -I%S/Inputs
 
 #include "absl/time/time.h"
 
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/abseil/time-subtraction.cpp 
b/clang-tools-extra/test/clang-tidy/checkers/abseil/time-subtraction.cpp
index 43d1feea1ec19..82014e8f46a5f 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/abseil/time-subtraction.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil/time-subtraction.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy -std=c++11-or-later %s abseil-time-subtraction %t -- 
-- -I %S/Inputs
+// RUN: %check_clang_tidy --match-partial-fixes -std=c++11-or-later %s 
abseil-time-subtraction %t -- -- -I %S/Inputs
 
 #include "absl/time/time.h"
 
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/abseil/upgrade-duration-conversions.cpp
 
b/clang-tools-extra/test/clang-tidy/checkers/abseil/upgrade-duration-conversions.cpp
index 32e65a63eb1c5..b5dfb4f4d73e8 100644
--- 
a/clang-tools-extra/test/clang-tidy/checkers/abseil/upgrade-duration-conversions.cpp
+++ 
b/clang-tools-extra/test/clang-tidy/checkers/abseil/upgrade-duration-conversions.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy -std=c++11-or-later %s 
abseil-upgrade-duration-conversions %t -- -- -I%S/Inputs
+// RUN: %check_clang_tidy --match-partial-fixes -std=c++11-or-later %s 
abseil-upgrade-duration-conversions %t -- -- -I%S/Inputs
 
 using int64_t = long long;
 
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/altera/struct-pack-align.cpp 
b/clang-tools-extra/test/clang-tidy/checkers/altera/struct-pack-align.cpp
index 472372ffe35c1..9aaca68b363a1 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/altera/struct-pack-align.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/altera/struct-pack-align.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s altera-struct-pack-align %t -- -header-filter=.*
+// RUN: %check_clang_tidy --match-partial-fixes %s altera-struct-pack-align %t 
-- -header-filter=.*
 
 // Struct needs both alignment and packing
 struct error {
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-memfd-create.cpp 
b/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-memfd-create.cpp
index a8dafd5e887a5..b2c299b46d0a3 100644
--- 
a/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-memfd-create.cpp
+++ 
b/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-memfd-create.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s android-cloexec-memfd-create %t
+// RUN: %check_clang_tidy --match-partial-fixes %s 
android-cloexec-memfd-create %t
 
 #define MFD_ALLOW_SEALING 1
 #define __O_CLOEXEC 3
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-open.cpp 
b/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-open.cpp
index 4ef1f400dad18..651e469721284 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-open.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-open.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s android-cloexec-open %t
+// RUN: %check_clang_tidy --match-partial-fixes %s android-cloexec-open %t
 
 #define O_RDWR 1
 #define O_EXCL 2
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-socket.cpp 
b/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-socket.cpp
index 25f332d313871..d4d58640f0eea 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-socket.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-socket.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s android-cloexec-socket %t
+// RUN: %check_clang_tidy --match-partial-fixes %s android-cloexec-socket %t
 
 #define SOCK_STREAM 1
 #define SOCK_DGRAM 2
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/bugprone/incorrect-enable-shared-from-this.cpp
 
b/clang-tools-extra/test/clang-tidy/checkers/bugprone/incorrect-enable-shared-from-this.cpp
index d9048ef359281..82b6ea84e6ff7 100644
--- 
a/clang-tools-extra/test/clang-tidy/checkers/bugprone/incorrect-enable-shared-from-this.cpp
+++ 
b/clang-tools-extra/test/clang-tidy/checkers/bugprone/incorrect-enable-shared-from-this.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy -std=c++11-or-later %s 
bugprone-incorrect-enable-shared-from-this %t
+// RUN: %check_clang_tidy --match-partial-fixes -std=c++11-or-later %s 
bugprone-incorrect-enable-shared-from-this %t
 
 // NOLINTBEGIN
 namespace std {
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/bugprone/move-forwarding-reference.cpp
 
b/clang-tools-extra/test/clang-tidy/checkers/bugprone/move-forwarding-reference.cpp
index 68eeb126b5dfa..66cd6baa4382d 100644
--- 
a/clang-tools-extra/test/clang-tidy/checkers/bugprone/move-forwarding-reference.cpp
+++ 
b/clang-tools-extra/test/clang-tidy/checkers/bugprone/move-forwarding-reference.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy -std=c++14-or-later %s 
bugprone-move-forwarding-reference %t -- -- -fno-delayed-template-parsing
+// RUN: %check_clang_tidy --match-partial-fixes -std=c++14-or-later %s 
bugprone-move-forwarding-reference %t -- -- -fno-delayed-template-parsing
 
 namespace std {
 template <typename> struct remove_reference;
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-in-initialization-strlen.c
 
b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-in-initialization-strlen.c
index 6e83804b45c60..a383958fbb906 100644
--- 
a/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-in-initialization-strlen.c
+++ 
b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-in-initialization-strlen.c
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
+// RUN: %check_clang_tidy --match-partial-fixes %s 
bugprone-not-null-terminated-result %t -- \
 // RUN: -- -std=c11 -I %S/Inputs/not-null-terminated-result
 
 #include "not-null-terminated-result-c.h"
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-safe-cxx.cpp
 
b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-safe-cxx.cpp
index 97a7f268d469b..8124b3bfa2268 100644
--- 
a/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-safe-cxx.cpp
+++ 
b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-safe-cxx.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
+// RUN: %check_clang_tidy --match-partial-fixes %s 
bugprone-not-null-terminated-result %t -- \
 // RUN: -- -std=c++11 -I %S/Inputs/not-null-terminated-result
 
 #include "not-null-terminated-result-cxx.h"
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-strlen.c
 
b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-strlen.c
index 6a907689921d0..4970af83bf4b6 100644
--- 
a/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-strlen.c
+++ 
b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-strlen.c
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
+// RUN: %check_clang_tidy --match-partial-fixes %s 
bugprone-not-null-terminated-result %t -- \
 // RUN: -- -std=c11 -I %S/Inputs/not-null-terminated-result
 
 // FIXME: Something wrong with the APInt un/signed conversion on Windows:
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-wcslen.cpp
 
b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-wcslen.cpp
index 7eb9330b36a26..06e2db9d6e0d6 100644
--- 
a/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-wcslen.cpp
+++ 
b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-wcslen.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
+// RUN: %check_clang_tidy --match-partial-fixes %s 
bugprone-not-null-terminated-result %t -- \
 // RUN: -- -std=c++11 -I %S/Inputs/not-null-terminated-result
 
 // FIXME: Something wrong with the APInt un/signed conversion on Windows:
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/bugprone/posix-return.cpp 
b/clang-tools-extra/test/clang-tidy/checkers/bugprone/posix-return.cpp
index 76d447a71d68b..8db05362069f7 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/posix-return.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/posix-return.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s bugprone-posix-return %t
+// RUN: %check_clang_tidy --match-partial-fixes %s bugprone-posix-return %t
 
 #define NULL nullptr
 #define ZERO 0
diff --git 
a/clang-tools-extra/test/clang-tidy/checkers/bugprone/standalone-empty.cpp 
b/clang-tools-extra/test/clang-tidy/checkers/bugprone/standalone-empty.cpp
index 53c651879f84b..bbb48d06ed924 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/standalone-empty.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/standalone-empty.cpp
@@ -176,14 +176,14 @@ bool test_member_empty() {
     std::vector_with_clear<int> v;
     v.empty();
     // CHECK-MESSAGES: :[[#@LINE-1]]:5: warning: ignoring the result of 
'empty()'; did you mean 'clear()'? [bugprone-standalone-empty]
-    // CHECK-FIXES: {{^  }}  v.clear();{{$}}
+    // CHECK-FIXES: v.clear();
   }
 
   {
     std::vector_with_int_empty<int> v;
     v.empty();
     // CHECK-MESSAGES: :[[#@LINE-1]]:5: warning: ignoring the result of 
'empty()'; did you mean 'clear()'? [bugprone-standalone-empty]
-    // CHECK-FIXES: {{^  }}  v.clear();{{$}}
+    // CHECK-FIXES: v.clear();
   }
 
   {
@@ -214,14 +214,14 @@ bool test_member_empty() {
     absl::string_with_clear s;
     s.empty();
     // CHECK-MESSAGES: :[[#@LINE-1]]:5: warning: ignoring the result of 
'empty()'; did you mean 'clear()'? [bugprone-standalone-empty]
-    // CHECK-FIXES: {{^  }}  s.clear();{{$}}
+    // CHECK-FIXES: s.clear();
   }
 
   {
     absl::string_with_int_empty s;
     s.empty();
     // CHECK-MESSAGES: :[[#@LINE-1]]:5: warning: ignoring the result of 
'empty()'; did you mean 'clear()'? [bugprone-standalone-empty]
-    // CHECK-FIXES: {{^  }}  s.clear();{{$}}
+    // CHECK-FIXES: s.clear();
   }
 
   {
@@ -302,11 +302,11 @@ bool test_qualified_empty() {
     absl::string_with_clear v;
     std::empty(v);
     // CHECK-MESSAGES: :[[#@LINE-1]]:5: warning: ignoring the result of 
'std::empty'; did you mean 'clear()'? [bugprone-standalone-empty]
-    // CHECK-FIXES: {{^  }}  v.clear();{{$}}
+    // CHECK-FIXES: v.clear();
 
     absl::empty(v);
     // CHECK-MESSAGES: :[[#@LINE-1]]:5: warning: ignoring the result of 
'absl::empty'; did you mean 'clear()'? [bugprone-standalone-empty]
-    // CHECK-FIXES: {{^  }}  v.clear();{{$}}
+    // CHECK-FIXES: v.clear();
 
     test::empty(v);
     // no-warning
@@ -361,21 +361,21 @@ bool test_unqualified_empty() {
     std::vector_with_void_empty<int> v;
     empty(v);
     // CHECK-MESSAGES: :[[#@LINE-1]]:5: warning: ignoring the result of 
'std::empty'; did you mean 'clear()'? [bugprone-standalone-empty]
-    // CHECK-FIXES: {{^  }}  v.clear();{{$}}
+    // CHECK-FIXES: v.clear();
   }
 
   {
     std::vector_with_clear<int> v;
     empty(v);
     // CHECK-MESSAGES: :[[#@LINE-1]]:5: warning: ignoring the result of 
'std::empty'; did you mean 'clear()'? [bugprone-standalone-empty]
-    // CHECK-FIXES: {{^  }}  v.clear();{{$}}
+    // CHECK-FIXES: v.clear();
   }
 
   {
     std::vector_with_int_empty<int> v;
     empty(v);
     // CHECK-MESSAGES: :[[#@LINE-1]]:5: warning: ignoring the result of 
'std::empty'; did you mean 'clear()'? [bugprone-standalone-empty]
-    // CHECK-FIXES: {{^  }}  v.clear();{{$}}
+    // CHECK-FIXES: v.clear();
   }
 
   {
@@ -400,21 +400,21 @@ bool test_unqualified_empty() {
     absl::string_with_void_empty s;
     empty(s);
     // CHECK-MESSAGES: :[[#@LINE-1]]:5: warning: ignoring the result of 
'absl::empty'; did you mean 'clear()'? [bugprone-standalone-empty]
-    // CHECK-FIXES: {{^  }}  s.clear();{{$}}
+    // CHECK-FIXES: s.clear();
   }
 
   {
     absl::stri...
[truncated]

``````````

</details>


https://github.com/llvm/llvm-project/pull/133756
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to