[clang-tools-extra] [clang-tidy][NFC] Implicitly add checkers/Inputs/Headers as system headers in tests (PR #185442)
via cfe-commits
cfe-commits at lists.llvm.org
Mon Mar 9 08:23:14 PDT 2026
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-clang-tidy
Author: Baranov Victor (vbvictor)
<details>
<summary>Changes</summary>
---
Patch is 70.93 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/185442.diff
91 Files Affected:
- (modified) clang-tools-extra/test/clang-tidy/check_clang_tidy.py (+8)
- (modified) clang-tools-extra/test/clang-tidy/checkers/abseil/redundant-strcat-calls.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/abseil/string-find-startswith.cpp (+1-3)
- (modified) clang-tools-extra/test/clang-tidy/checkers/boost/use-ranges-pipe.cpp (+2-2)
- (modified) clang-tools-extra/test/clang-tidy/checkers/boost/use-ranges.cpp (+2-2)
- (modified) clang-tools-extra/test/clang-tidy/checkers/boost/use-to-string.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/bugprone/dangling-handle.cpp (+2-5)
- (modified) clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-prefixsuffixname.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-minimal.c (+1-3)
- (modified) clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-posix.c (+1-3)
- (modified) clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler.c (+2-2)
- (modified) clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/bugprone/sizeof-container.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/bugprone/std-namespace-modification.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/bugprone/string-constructor-options.cpp (+1-2)
- (modified) clang-tools-extra/test/clang-tidy/checkers/bugprone/string-integer-assignment.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-include.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-stringview-data-usage-options.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-stringview-data-usage.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/bugprone/unchecked-optional-access.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-return-value.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/cert/uppercase-literal-suffix-integer.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/google/objc-function-naming.m (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/llvm/include-order.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/llvm/use-ranges.cpp (+1-1)
- (renamed) clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/locale.h ()
- (renamed) clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/math.h ()
- (renamed) clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/time.h ()
- (modified) clang-tools-extra/test/clang-tidy/checkers/llvmlibc/restrict-system-libc-headers.cpp (+7-7)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-default-init.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/pass-by-value-macro-header.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/replace-random-shuffle.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/return-braced-init-list.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/shrink-to-fit.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/use-emplace-ignore-implicit-constructors.cpp (+1-2)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard.cpp (+1-2)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/use-ranges-pipe.cpp (+2-2)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/use-ranges.cpp (+2-2)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/use-scope-lock-warn-on-using-and-typedef-false.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/use-scoped-lock-no-crash.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/use-scoped-lock-warn-on-single-locks-false.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/use-scoped-lock.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/use-starts-ends-with.cpp (+1-3)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-format-custom.cpp (+2-5)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-format-fmt.cpp (+1-3)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-format-member.cpp (+1-3)
- (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-absl.cpp (+2-5)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print-custom.cpp (+1-3)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print-fmt.cpp (+1-3)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print-member.cpp (+1-3)
- (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-string-view-custom-view.cpp (+1-3)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/use-string-view-cxx20.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/use-string-view-ignored.cpp (+1-3)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/use-string-view.cpp (+1-3)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-transform-lambdas-cxx14.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-transform-lambdas.cpp (+3-3)
- (modified) clang-tools-extra/test/clang-tidy/checkers/performance/faster-string-find.cpp (+2-2)
- (modified) clang-tools-extra/test/clang-tidy/checkers/performance/inefficient-string-concatenation-strict.cpp (+1-3)
- (modified) clang-tools-extra/test/clang-tidy/checkers/performance/inefficient-string-concatenation.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/performance/inefficient-vector-operation.cpp (+1-2)
- (modified) clang-tools-extra/test/clang-tidy/checkers/performance/move-constructor-init.cpp (+5-7)
- (modified) clang-tools-extra/test/clang-tidy/checkers/performance/string-view-conversions-cxx20.cpp (+1-3)
- (modified) clang-tools-extra/test/clang-tidy/checkers/performance/string-view-conversions.cpp (+1-3)
- (modified) clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-includestyle.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/container-contains.cpp (+1-3)
- (modified) clang-tools-extra/test/clang-tidy/checkers/readability/container-data-pointer.cpp (+2-2)
- (modified) clang-tools-extra/test/clang-tidy/checkers/readability/container-size-empty.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/readability/convert-member-functions-to-static-deducing-this.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/readability/isolate-declaration-cxx17.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/readability/qualified-auto-cxx20.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/readability/qualified-auto.cpp (+2-3)
- (modified) clang-tools-extra/test/clang-tidy/checkers/readability/redundant-smartptr-get.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-cstr-format.cpp (+2-2)
- (modified) clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-cstr-function.cpp (+1-2)
- (modified) clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-cstr.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-init.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/readability/simplify-subscript-expr.cpp (+1-2)
- (modified) clang-tools-extra/test/clang-tidy/checkers/readability/string-compare-custom-string-classes.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/readability/string-compare.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-cxx23.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-floating-point.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-hexadecimal-floating-point.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer-custom-list.cpp (+1-2)
- (modified) clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer-ms.cpp (+1-1)
- (modified) clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer.cpp (+1-1)
``````````diff
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 62377a1ccbf1b..601e067db12e9 100755
--- a/clang-tools-extra/test/clang-tidy/check_clang_tidy.py
+++ b/clang-tools-extra/test/clang-tidy/check_clang_tidy.py
@@ -156,6 +156,14 @@ def __init__(self, args: argparse.Namespace, extra_args: List[str]) -> None:
# implementations of relevant APIs.
self.clang_extra_args.append("-nostdinc++")
+ # Include the clang-tidy test headers directory as a system include
+ # path so individual tests don't need to specify it.
+ headers_dir = os.path.join(
+ os.path.dirname(__file__), "checkers", "Inputs", "Headers"
+ )
+ if os.path.isdir(headers_dir):
+ self.clang_extra_args.extend(["-isystem", headers_dir])
+
if self.resource_dir is not None:
self.clang_extra_args.append("-resource-dir=%s" % self.resource_dir)
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 8fa1b1e1ad906..7159b5f52b8ff 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 %s abseil-redundant-strcat-calls %t
#include <string>
namespace absl {
diff --git a/clang-tools-extra/test/clang-tidy/checkers/abseil/string-find-startswith.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil/string-find-startswith.cpp
index c2ce0e347e074..9c2a1376f76f2 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/abseil/string-find-startswith.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/abseil/string-find-startswith.cpp
@@ -1,9 +1,7 @@
// RUN: %check_clang_tidy -std=c++17 %s abseil-string-find-startswith %t -- \
// RUN: -config="{CheckOptions: \
// RUN: {abseil-string-find-startswith.StringLikeClasses: \
-// RUN: '::std::basic_string;::std::basic_string_view;::basic_string'}}" \
-// RUN: -- -isystem %clang_tidy_headers
-
+// RUN: '::std::basic_string;::std::basic_string_view;::basic_string'}}"
#include <string>
using size_t = decltype(sizeof(int));
diff --git a/clang-tools-extra/test/clang-tidy/checkers/boost/use-ranges-pipe.cpp b/clang-tools-extra/test/clang-tidy/checkers/boost/use-ranges-pipe.cpp
index 9254c461e8188..aaf3ce512ba7f 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/boost/use-ranges-pipe.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/boost/use-ranges-pipe.cpp
@@ -1,7 +1,7 @@
// RUN: %check_clang_tidy -std=c++14-or-later %s boost-use-ranges %t -check-suffixes=,PIPE \
// RUN: -config="{CheckOptions: { \
-// RUN: boost-use-ranges.UseReversePipe: true }}" -- -isystem %clang_tidy_headers -I %S/Inputs/use-ranges/
-// RUN: %check_clang_tidy -std=c++14-or-later %s boost-use-ranges %t -check-suffixes=,NOPIPE -- -isystem %clang_tidy_headers -I %S/Inputs/use-ranges/
+// RUN: boost-use-ranges.UseReversePipe: true }}" -- -I %S/Inputs/use-ranges/
+// RUN: %check_clang_tidy -std=c++14-or-later %s boost-use-ranges %t -check-suffixes=,NOPIPE -- -I %S/Inputs/use-ranges/
// CHECK-FIXES: #include <boost/algorithm/cxx11/is_sorted.hpp>
// CHECK-FIXES: #include <boost/range/adaptor/reversed.hpp>
diff --git a/clang-tools-extra/test/clang-tidy/checkers/boost/use-ranges.cpp b/clang-tools-extra/test/clang-tidy/checkers/boost/use-ranges.cpp
index 0e52607099801..c32fc664888e8 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/boost/use-ranges.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/boost/use-ranges.cpp
@@ -1,5 +1,5 @@
-// RUN: %check_clang_tidy -std=c++14 %s boost-use-ranges %t -- -- -isystem %clang_tidy_headers -I %S/Inputs/use-ranges/
-// RUN: %check_clang_tidy -std=c++17-or-later %s boost-use-ranges %t -check-suffixes=,CPP17 -- -isystem %clang_tidy_headers -I %S/Inputs/use-ranges/
+// RUN: %check_clang_tidy -std=c++14 %s boost-use-ranges %t -- -- -I %S/Inputs/use-ranges/
+// RUN: %check_clang_tidy -std=c++17-or-later %s boost-use-ranges %t -check-suffixes=,CPP17 -- -I %S/Inputs/use-ranges/
// CHECK-FIXES: #include <boost/range/algorithm/find.hpp>
// CHECK-FIXES: #include <boost/range/algorithm/reverse.hpp>
diff --git a/clang-tools-extra/test/clang-tidy/checkers/boost/use-to-string.cpp b/clang-tools-extra/test/clang-tidy/checkers/boost/use-to-string.cpp
index 815c254e09a86..804d334f4a80b 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/boost/use-to-string.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/boost/use-to-string.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s boost-use-to-string %t -- -- -isystem %clang_tidy_headers
+// RUN: %check_clang_tidy %s boost-use-to-string %t
#include <string>
namespace boost {
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment.cpp
index 5576bc5541d60..dd8221772a300 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s bugprone-argument-comment %t -- -- -I %S/Inputs/argument-comment -isystem %clang_tidy_headers
+// RUN: %check_clang_tidy %s bugprone-argument-comment %t -- -- -I %S/Inputs/argument-comment
// FIXME: clang-tidy should provide a -verify mode to make writing these checks
// easier and more accurate.
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/dangling-handle.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/dangling-handle.cpp
index e6da761aa9121..2467b3383b44a 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/dangling-handle.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/dangling-handle.cpp
@@ -1,14 +1,11 @@
// RUN: %check_clang_tidy -std=c++11,c++14 -check-suffix=,CXX14 %s bugprone-dangling-handle %t -- \
// RUN: -config="{CheckOptions: \
// RUN: {bugprone-dangling-handle.HandleClasses: \
-// RUN: 'std::basic_string_view; ::llvm::StringRef;'}}" \
-// RUN: -- -isystem %clang_tidy_headers
-
+// RUN: 'std::basic_string_view; ::llvm::StringRef;'}}"
// RUN: %check_clang_tidy -std=c++17-or-later -check-suffix=,CXX17 %s bugprone-dangling-handle %t -- \
// RUN: -config="{CheckOptions: \
// RUN: {bugprone-dangling-handle.HandleClasses: \
-// RUN: 'std::basic_string_view; ::llvm::StringRef;'}}" \
-// RUN: -- -isystem %clang_tidy_headers
+// RUN: 'std::basic_string_view; ::llvm::StringRef;'}}"
#include <string>
#include <vector>
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-prefixsuffixname.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-prefixsuffixname.cpp
index fdcc461c45936..5d4047265ca0a 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-prefixsuffixname.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-prefixsuffixname.cpp
@@ -7,7 +7,7 @@
// RUN: bugprone-easily-swappable-parameters.ModelImplicitConversions: 0, \
// RUN: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 0, \
// RUN: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityThreshold: 1 \
-// RUN: }}' -- -isystem %clang_tidy_headers
+// RUN: }}'
#include <string>
class Matrix {};
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-minimal.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-minimal.c
index 7030efd5dc3d9..c2ff5d405181f 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-minimal.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-minimal.c
@@ -1,8 +1,6 @@
// RUN: %check_clang_tidy %s bugprone-signal-handler %t \
// RUN: -config='{CheckOptions: \
-// RUN: {bugprone-signal-handler.AsyncSafeFunctionSet: "minimal"}}' \
-// RUN: -- -isystem %clang_tidy_headers
-
+// RUN: {bugprone-signal-handler.AsyncSafeFunctionSet: "minimal"}}'
#include "signal.h"
#include "stdlib.h"
#include "string.h"
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-posix.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-posix.c
index 3e9b395a70474..d967a63433a7a 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-posix.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-posix.c
@@ -1,8 +1,6 @@
// RUN: %check_clang_tidy %s bugprone-signal-handler %t \
// RUN: -config='{CheckOptions: \
-// RUN: {bugprone-signal-handler.AsyncSafeFunctionSet: "POSIX"}}' \
-// RUN: -- -isystem %clang_tidy_headers
-
+// RUN: {bugprone-signal-handler.AsyncSafeFunctionSet: "POSIX"}}'
#include "signal.h"
#include "stdlib.h"
#include "stdio.h"
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler.c
index a8f6f3bba20b9..aa51ba6bd476c 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler.c
@@ -1,5 +1,5 @@
-// RUN: %check_clang_tidy -std=c99,c11,c17 -check-suffixes=,BEFORE-23 %s bugprone-signal-handler %t -- -- -isystem %clang_tidy_headers
-// RUN: %check_clang_tidy -std=c23-or-later %s bugprone-signal-handler %t -- -- -isystem %clang_tidy_headers
+// RUN: %check_clang_tidy -std=c99,c11,c17 -check-suffixes=,BEFORE-23 %s bugprone-signal-handler %t
+// RUN: %check_clang_tidy -std=c23-or-later %s bugprone-signal-handler %t
#include "signal.h"
#include "stdlib.h"
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler.cpp
index 8dcfb3330befe..6d369d2f3fddf 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy -std=c++11,c++14 %s bugprone-signal-handler %t -- -- -isystem %clang_tidy_headers -isystem %S/Inputs/signal-handler -target x86_64-unknown-unknown
+// RUN: %check_clang_tidy -std=c++11,c++14 %s bugprone-signal-handler %t -- -- -isystem %S/Inputs/signal-handler -target x86_64-unknown-unknown
// FIXME: Fix the checker to work in C++17 or later mode.
#include "stdcpp.h"
#include "stdio.h"
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/sizeof-container.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/sizeof-container.cpp
index 694cabc0d0375..fa35b48fb20ee 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/sizeof-container.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/sizeof-container.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s bugprone-sizeof-container %t -- -- -isystem %clang_tidy_headers -target x86_64-unknown-unknown
+// RUN: %check_clang_tidy %s bugprone-sizeof-container %t -- -- -target x86_64-unknown-unknown
#include <string>
#include <vector>
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/std-namespace-modification.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/std-namespace-modification.cpp
index f594e6948a9ad..63bd66cb66372 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/std-namespace-modification.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/std-namespace-modification.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy -std=c++17-or-later %s bugprone-std-namespace-modification %t -- -- -I %clang_tidy_headers
+// RUN: %check_clang_tidy -std=c++17-or-later %s bugprone-std-namespace-modification %t
#include "system-header-simulation.h"
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/string-constructor-options.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/string-constructor-options.cpp
index c414933f1fe82..90248373165f8 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/string-constructor-options.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/string-constructor-options.cpp
@@ -3,8 +3,7 @@
// RUN: bugprone-string-constructor.WarnOnLargeLength: true, \
// RUN: bugprone-string-constructor.LargeLengthThreshold: 10, \
// RUN: bugprone-string-constructor.StringNames: '::std::basic_string;::std::basic_string_view;::custom::String' \
-// RUN: }}" -- -isystem %clang_tidy_headers
-
+// RUN: }}"
#include <string>
namespace custom {
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/string-integer-assignment.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/string-integer-assignment.cpp
index f5a4b079fa074..066917d62042e 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/string-integer-assignment.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/string-integer-assignment.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s bugprone-string-integer-assignment %t -- -- -isystem %clang_tidy_headers -fno-delayed-template-parsing
+// RUN: %check_clang_tidy %s bugprone-string-integer-assignment %t -- -- -fno-delayed-template-parsing
#include <string>
namespace std {
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-include.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-include.cpp
index 4f2acbc2fe7c9..b12b08ee3fd67 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-include.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-include.cpp
@@ -1,6 +1,6 @@
// RUN: %check_clang_tidy %s bugprone-suspicious-include %t -- \
// RUN: -config="{CheckOptions: {bugprone-suspicious-include.IgnoredRegex: 'moc_.*'}"} -- \
-// RUN: -isystem %clang_tidy_headers -fmodules
+// RUN: -fmodules
// clang-format off
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-stringview-data-usage-options.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-stringview-data-usage-options.cpp
index 64ec7432a9ddd..5c1a7f4341f80 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-stringview-data-usage-options.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-stringview-data-usage-options.cpp
@@ -2,7 +2,7 @@
// RUN: -config="{CheckOptions: { \
// RUN: bugprone-suspicious-stringview-data-usage.StringViewTypes: '::custom::StrView', \
// RUN: bugprone-suspicious-stringview-data-usage.AllowedCallees: '::safe_func;SafeClass' \
-// RUN: }}" -- -isystem %clang_tidy_headers
+// RUN: }}"
#include <string>
namespace custom {
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-stringview-data-usage.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-stringview-data-usage.cpp
index 8072d60a2f47a..f2182c109854a 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-stringview-data-usage.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-stringview-data-usage.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy -std=c++17-or-later %s bugprone-suspicious-stringview-data-usage %t -- -- -isystem %clang_tidy_headers
+// RUN: %check_clang_tidy -std=c++17-or-later %s bugprone-suspicious-stringview-data-usage %t
#include <string>
struct View {
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/unchecked-optional-access.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unchecked-optional-access.cpp
index 4831374bda6db..214072de772e2 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/unchecked-optional-access.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unchecked-optional-access.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s bugprone-unchecked-optional-access %t -- -- -I %S/Inputs/unchecked-optional-access -isystem %clang_tidy_headers
+// RUN: %check_clang_tidy %s bugprone-unchecked-optional-access %t -- -- -I %S/Inputs/unchecked-optional-access
#include "absl/types/optional.h"
#include "folly/types/Optional.h"
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-return-value.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-return-value.cpp
index 938f12a582fbe..7ecacabef1a0b 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-return-value.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-return-value.cpp
@@ -1,5 +1,5 @@
// RUN: %check_clang_tidy %s bugprone-unused-return-value %t -- \
-// RUN: --config="{CheckOptions: {bugprone-unused-return-value.AllowCastToVoid: true}}" -- -fexceptions -isystem %clang_tidy_headers
+// RUN: --config="{CheckOptions: {bugprone-unused-return-value.AllowCastToVoid: true}}" -- -fexceptions
#include <vector>
namespace std {
diff --git a/clang-tools-extra/test/clang-tidy/checkers/cert/uppercase-literal-suffix-integer.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert/uppercase-literal-suffix-integer.cpp
index 6d6d83d6cac49..44dadb7d5c797 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/cert/uppercase-literal-suffix-integer.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cert/uppercase-literal-suffix-integer.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s cert-dcl16-c %t -- -- -I %clang_tidy_headers
+// RUN: %check_clang_tidy %s cert-dcl16-c %t
#include "integral_constant.h"
diff --git a/clang-tools-extra/test/clang-tidy/checkers/google/objc-function-naming.m b/clang-tools-extra/test/clang-tidy/checkers/google/objc-function-naming.m
index 13d00a86b3c72..796e361b41f12 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/google/objc-function-naming.m
+++ b/clang-tools-extra/test/clang-tidy/checkers/google/objc-function-naming.m
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s google-objc-function-naming %t -- -- -isystem %clang_tidy_headers
+// RUN: %check_clang_tidy %s google-objc-function-naming %t
#include <stdio.h>
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 6e8c748a9950b..c7201edf84b05 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
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s llvm-include-order %t -- -- -isystem %clang_tidy_headers
+// RUN: %check_clang_tidy %s llvm-include-order %t
// CHECK-MESSAGES: [[@LINE+2]]:1: warning: #includes are not sorted properly
#include "j.h"
diff --git a/clang-tools-extra/test/clang-tidy/checkers/llvm/use-ranges.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvm/use-ranges.cpp
index 7be84f59b5a8c..85f397f487e6d 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/llvm/use-ranges.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/llvm/use-ranges.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s llvm-use-ranges %t -- -- -isystem %clang_tidy_headers
+// RUN: %check_clang_tidy %s llvm-use-ranges %t
#include <vector>
// Test that the header is included
diff --git a/clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/stdio.h b/clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/locale.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/stdio.h
rename to clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/locale.h
diff --git a/clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/stdlib.h b/clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/math.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/stdlib.h
rename to clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/math.h
diff --git a/clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/string.h b/clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/time.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/string.h
rename to clang-tool...
[truncated]
``````````
</details>
https://github.com/llvm/llvm-project/pull/185442
More information about the cfe-commits
mailing list