[clang-tidy][custom-check][NFC] fix test when `CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS` disable #159809

HerrCai0907 · 2025-09-19T16:17:57Z

No description provided.

…CUSTOM_CHECKS disable

llvmbot · 2025-09-19T16:18:31Z

@llvm/pr-subscribers-clang-tidy

Author: Congcong Cai (HerrCai0907)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/159809.diff

8 Files Affected:

(modified) clang-tools-extra/test/CMakeLists.txt (+1)
(modified) clang-tools-extra/test/clang-tidy/checkers/custom/query-incorrect-query.cpp (+1)
(modified) clang-tools-extra/test/clang-tidy/checkers/custom/query-partially-active-check.cpp (+1)
(modified) clang-tools-extra/test/clang-tidy/checkers/custom/query.cpp (+1)
(modified) clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check.cpp (+3-1)
(modified) clang-tools-extra/test/lit.cfg.py (+2-1)
(modified) clang-tools-extra/test/lit.site.cfg.py.in (+1)
(modified) clang-tools-extra/unittests/clang-tidy/CMakeLists.txt (+7-1)

diff --git a/clang-tools-extra/test/CMakeLists.txt b/clang-tools-extra/test/CMakeLists.txt
index d8175d1b2b6d0..a70d2ef2d92f2 100644
--- a/clang-tools-extra/test/CMakeLists.txt
+++ b/clang-tools-extra/test/CMakeLists.txt
@@ -9,6 +9,7 @@ set(CLANG_TOOLS_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/..")
 
 llvm_canonicalize_cmake_booleans(
   CLANG_TIDY_ENABLE_STATIC_ANALYZER
+  CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS
   CLANG_PLUGIN_SUPPORT
   LLVM_INSTALL_TOOLCHAIN_ONLY
   )
diff --git a/clang-tools-extra/test/clang-tidy/checkers/custom/query-incorrect-query.cpp b/clang-tools-extra/test/clang-tidy/checkers/custom/query-incorrect-query.cpp
index f9a73750b4c3e..428276019bfb6 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/custom/query-incorrect-query.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/custom/query-incorrect-query.cpp
@@ -1,3 +1,4 @@
+// REQUIRES: custom-check
 // RUN: %check_clang_tidy %s custom-* %t --config-file=%S/Inputs/incorrect-clang-tidy.yml
 
 // CHECK-MESSAGES: warning: 1:1: Matcher not found: varDeclInvalid in 'test-let-bind-invalid-2' [clang-tidy-config]
diff --git a/clang-tools-extra/test/clang-tidy/checkers/custom/query-partially-active-check.cpp b/clang-tools-extra/test/clang-tidy/checkers/custom/query-partially-active-check.cpp
index 962313ddb587b..cec3caefa9279 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/custom/query-partially-active-check.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/custom/query-partially-active-check.cpp
@@ -1,3 +1,4 @@
+// REQUIRES: custom-check
 // RUN: %check_clang_tidy %s custom-test-let-bind %t --config-file=%S/Inputs/clang-tidy.yml
 
 extern long E;
diff --git a/clang-tools-extra/test/clang-tidy/checkers/custom/query.cpp b/clang-tools-extra/test/clang-tidy/checkers/custom/query.cpp
index e9a27301bd611..6b34669054df8 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/custom/query.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/custom/query.cpp
@@ -1,3 +1,4 @@
+// REQUIRES: custom-check
 // RUN: %check_clang_tidy %s custom-* %t --config-file=%S/Inputs/clang-tidy.yml
 
 extern long E;
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check.cpp
index 8d0bc2bed180d..dc1f3f3754079 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check.cpp
@@ -1,3 +1,6 @@
+// REQUIRES: shell
+// REQUIRES: custom-check
+
 // RUN: sed -e "s:INPUT_DIR:%S/Inputs/custom-query-check:g" -e "s:OUT_DIR:%t:g" -e "s:MAIN_FILE:%s:g" %S/Inputs/custom-query-check/vfsoverlay.yaml > %t.yaml
 // RUN: clang-tidy --experimental-custom-checks %t/main.cpp -checks='-*,custom-*' -vfsoverlay %t.yaml | FileCheck %s --check-prefix=CHECK-SAME-DIR
 // RUN: clang-tidy --experimental-custom-checks %t/subdir/main.cpp -checks='-*,custom-*' -vfsoverlay %t.yaml | FileCheck %s --check-prefix=CHECK-SUB-DIR-BASE
@@ -6,7 +9,6 @@
 // RUN: clang-tidy --experimental-custom-checks %t/subdir-append/main.cpp -checks='-*,custom-*' -vfsoverlay %t.yaml | FileCheck %s --check-prefix=CHECK-SUB-DIR-APPEND
 // RUN: clang-tidy --experimental-custom-checks %t/subdir-append/main.cpp -checks='-*,custom-*' -vfsoverlay %t.yaml --list-checks | FileCheck %s --check-prefix=LIST-CHECK
 // RUN: clang-tidy --experimental-custom-checks %t/subdir-append/main.cpp -checks='-*,custom-*' -vfsoverlay %t.yaml --dump-config | FileCheck %s --check-prefix=DUMP-CONFIG
-// REQUIRES: shell
 
 
 long V;
diff --git a/clang-tools-extra/test/lit.cfg.py b/clang-tools-extra/test/lit.cfg.py
index b503c659f6022..c1da37d61bd61 100644
--- a/clang-tools-extra/test/lit.cfg.py
+++ b/clang-tools-extra/test/lit.cfg.py
@@ -54,7 +54,8 @@
 
 if config.clang_tidy_staticanalyzer:
     config.available_features.add("static-analyzer")
-
+if config.clang_tidy_custom_check:
+    config.available_features.add("custom-check")
 python_exec = shlex.quote(config.python_executable)
 check_clang_tidy = os.path.join(
     config.test_source_root, "clang-tidy", "check_clang_tidy.py"
diff --git a/clang-tools-extra/test/lit.site.cfg.py.in b/clang-tools-extra/test/lit.site.cfg.py.in
index e6503a4c097ca..152ea6be2771c 100644
--- a/clang-tools-extra/test/lit.site.cfg.py.in
+++ b/clang-tools-extra/test/lit.site.cfg.py.in
@@ -10,6 +10,7 @@ config.python_executable = "@Python3_EXECUTABLE@"
 config.target_triple = "@LLVM_TARGET_TRIPLE@"
 config.host_triple = "@LLVM_HOST_TRIPLE@"
 config.clang_tidy_staticanalyzer = @CLANG_TIDY_ENABLE_STATIC_ANALYZER@
+config.clang_tidy_custom_check = @CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS@
 config.has_plugins = @CLANG_PLUGIN_SUPPORT@
 # Support substitution of the tools and libs dirs with user parameters. This is
 # used when we can't determine the tool dir at configuration time.
diff --git a/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt b/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt
index a3f20f5c1359f..f4b52de4251eb 100644
--- a/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt
+++ b/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt
@@ -54,7 +54,6 @@ target_link_libraries(ClangTidyTests
   PRIVATE
   clangTidy
   clangTidyAndroidModule
-  clangTidyCustomModule
   clangTidyGoogleModule
   clangTidyMiscModule
   clangTidyLLVMModule
@@ -65,3 +64,10 @@ target_link_libraries(ClangTidyTests
   LLVMTestingAnnotations
   LLVMTestingSupport
   )
+
+if(CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS)
+  target_link_libraries(ClangTidyTests
+    PRIVATE
+    clangTidyCustomModule
+    )
+endif()
\ No newline at end of file

llvmbot · 2025-09-19T16:18:32Z

@llvm/pr-subscribers-clang-tools-extra

Author: Congcong Cai (HerrCai0907)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/159809.diff

8 Files Affected:

(modified) clang-tools-extra/test/CMakeLists.txt (+1)
(modified) clang-tools-extra/test/clang-tidy/checkers/custom/query-incorrect-query.cpp (+1)
(modified) clang-tools-extra/test/clang-tidy/checkers/custom/query-partially-active-check.cpp (+1)
(modified) clang-tools-extra/test/clang-tidy/checkers/custom/query.cpp (+1)
(modified) clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check.cpp (+3-1)
(modified) clang-tools-extra/test/lit.cfg.py (+2-1)
(modified) clang-tools-extra/test/lit.site.cfg.py.in (+1)
(modified) clang-tools-extra/unittests/clang-tidy/CMakeLists.txt (+7-1)

diff --git a/clang-tools-extra/test/CMakeLists.txt b/clang-tools-extra/test/CMakeLists.txt
index d8175d1b2b6d0..a70d2ef2d92f2 100644
--- a/clang-tools-extra/test/CMakeLists.txt
+++ b/clang-tools-extra/test/CMakeLists.txt
@@ -9,6 +9,7 @@ set(CLANG_TOOLS_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/..")
 
 llvm_canonicalize_cmake_booleans(
   CLANG_TIDY_ENABLE_STATIC_ANALYZER
+  CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS
   CLANG_PLUGIN_SUPPORT
   LLVM_INSTALL_TOOLCHAIN_ONLY
   )
diff --git a/clang-tools-extra/test/clang-tidy/checkers/custom/query-incorrect-query.cpp b/clang-tools-extra/test/clang-tidy/checkers/custom/query-incorrect-query.cpp
index f9a73750b4c3e..428276019bfb6 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/custom/query-incorrect-query.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/custom/query-incorrect-query.cpp
@@ -1,3 +1,4 @@
+// REQUIRES: custom-check
 // RUN: %check_clang_tidy %s custom-* %t --config-file=%S/Inputs/incorrect-clang-tidy.yml
 
 // CHECK-MESSAGES: warning: 1:1: Matcher not found: varDeclInvalid in 'test-let-bind-invalid-2' [clang-tidy-config]
diff --git a/clang-tools-extra/test/clang-tidy/checkers/custom/query-partially-active-check.cpp b/clang-tools-extra/test/clang-tidy/checkers/custom/query-partially-active-check.cpp
index 962313ddb587b..cec3caefa9279 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/custom/query-partially-active-check.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/custom/query-partially-active-check.cpp
@@ -1,3 +1,4 @@
+// REQUIRES: custom-check
 // RUN: %check_clang_tidy %s custom-test-let-bind %t --config-file=%S/Inputs/clang-tidy.yml
 
 extern long E;
diff --git a/clang-tools-extra/test/clang-tidy/checkers/custom/query.cpp b/clang-tools-extra/test/clang-tidy/checkers/custom/query.cpp
index e9a27301bd611..6b34669054df8 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/custom/query.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/custom/query.cpp
@@ -1,3 +1,4 @@
+// REQUIRES: custom-check
 // RUN: %check_clang_tidy %s custom-* %t --config-file=%S/Inputs/clang-tidy.yml
 
 extern long E;
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check.cpp
index 8d0bc2bed180d..dc1f3f3754079 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check.cpp
@@ -1,3 +1,6 @@
+// REQUIRES: shell
+// REQUIRES: custom-check
+
 // RUN: sed -e "s:INPUT_DIR:%S/Inputs/custom-query-check:g" -e "s:OUT_DIR:%t:g" -e "s:MAIN_FILE:%s:g" %S/Inputs/custom-query-check/vfsoverlay.yaml > %t.yaml
 // RUN: clang-tidy --experimental-custom-checks %t/main.cpp -checks='-*,custom-*' -vfsoverlay %t.yaml | FileCheck %s --check-prefix=CHECK-SAME-DIR
 // RUN: clang-tidy --experimental-custom-checks %t/subdir/main.cpp -checks='-*,custom-*' -vfsoverlay %t.yaml | FileCheck %s --check-prefix=CHECK-SUB-DIR-BASE
@@ -6,7 +9,6 @@
 // RUN: clang-tidy --experimental-custom-checks %t/subdir-append/main.cpp -checks='-*,custom-*' -vfsoverlay %t.yaml | FileCheck %s --check-prefix=CHECK-SUB-DIR-APPEND
 // RUN: clang-tidy --experimental-custom-checks %t/subdir-append/main.cpp -checks='-*,custom-*' -vfsoverlay %t.yaml --list-checks | FileCheck %s --check-prefix=LIST-CHECK
 // RUN: clang-tidy --experimental-custom-checks %t/subdir-append/main.cpp -checks='-*,custom-*' -vfsoverlay %t.yaml --dump-config | FileCheck %s --check-prefix=DUMP-CONFIG
-// REQUIRES: shell
 
 
 long V;
diff --git a/clang-tools-extra/test/lit.cfg.py b/clang-tools-extra/test/lit.cfg.py
index b503c659f6022..c1da37d61bd61 100644
--- a/clang-tools-extra/test/lit.cfg.py
+++ b/clang-tools-extra/test/lit.cfg.py
@@ -54,7 +54,8 @@
 
 if config.clang_tidy_staticanalyzer:
     config.available_features.add("static-analyzer")
-
+if config.clang_tidy_custom_check:
+    config.available_features.add("custom-check")
 python_exec = shlex.quote(config.python_executable)
 check_clang_tidy = os.path.join(
     config.test_source_root, "clang-tidy", "check_clang_tidy.py"
diff --git a/clang-tools-extra/test/lit.site.cfg.py.in b/clang-tools-extra/test/lit.site.cfg.py.in
index e6503a4c097ca..152ea6be2771c 100644
--- a/clang-tools-extra/test/lit.site.cfg.py.in
+++ b/clang-tools-extra/test/lit.site.cfg.py.in
@@ -10,6 +10,7 @@ config.python_executable = "@Python3_EXECUTABLE@"
 config.target_triple = "@LLVM_TARGET_TRIPLE@"
 config.host_triple = "@LLVM_HOST_TRIPLE@"
 config.clang_tidy_staticanalyzer = @CLANG_TIDY_ENABLE_STATIC_ANALYZER@
+config.clang_tidy_custom_check = @CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS@
 config.has_plugins = @CLANG_PLUGIN_SUPPORT@
 # Support substitution of the tools and libs dirs with user parameters. This is
 # used when we can't determine the tool dir at configuration time.
diff --git a/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt b/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt
index a3f20f5c1359f..f4b52de4251eb 100644
--- a/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt
+++ b/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt
@@ -54,7 +54,6 @@ target_link_libraries(ClangTidyTests
   PRIVATE
   clangTidy
   clangTidyAndroidModule
-  clangTidyCustomModule
   clangTidyGoogleModule
   clangTidyMiscModule
   clangTidyLLVMModule
@@ -65,3 +64,10 @@ target_link_libraries(ClangTidyTests
   LLVMTestingAnnotations
   LLVMTestingSupport
   )
+
+if(CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS)
+  target_link_libraries(ClangTidyTests
+    PRIVATE
+    clangTidyCustomModule
+    )
+endif()
\ No newline at end of file

[clang-tidy][custom-check] fix CI when CLANG_TIDY_ENABLE_QUERY_BASED_…

bef3d5e

…CUSTOM_CHECKS disable

llvmbot added clang-tools-extra clang-tidy labels Sep 19, 2025

HerrCai0907 mentioned this pull request Sep 19, 2025

reapply "[clang-tidy] support query based custom check" #159547

Merged

HerrCai0907 changed the title ~~[clang-tidy][custom-check] fix CI when CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS disable~~ [clang-tidy][custom-check][NFC] fix test when CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS disable (#159809) Sep 19, 2025

HerrCai0907 changed the title ~~[clang-tidy][custom-check][NFC] fix test when CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS disable (#159809)~~ [clang-tidy][custom-check][NFC] fix test when CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS disable Sep 19, 2025

HerrCai0907 enabled auto-merge (squash) September 19, 2025 16:21

eof

ecdedca

HerrCai0907 disabled auto-merge September 19, 2025 16:25

HerrCai0907 enabled auto-merge (squash) September 19, 2025 16:26

HerrCai0907 merged commit a513b70 into llvm:main Sep 19, 2025
9 checks passed

HerrCai0907 deleted the fix/ci/check-clang-tools branch September 19, 2025 16:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[clang-tidy][custom-check][NFC] fix test when `CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS` disable #159809

[clang-tidy][custom-check][NFC] fix test when `CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS` disable #159809

Uh oh!

HerrCai0907 commented Sep 19, 2025

Uh oh!

llvmbot commented Sep 19, 2025

Uh oh!

llvmbot commented Sep 19, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

[clang-tidy][custom-check][NFC] fix test when CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS disable #159809

[clang-tidy][custom-check][NFC] fix test when CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS disable #159809

Uh oh!

Conversation

HerrCai0907 commented Sep 19, 2025

Uh oh!

llvmbot commented Sep 19, 2025

Uh oh!

llvmbot commented Sep 19, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

[clang-tidy][custom-check][NFC] fix test when `CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS` disable #159809

[clang-tidy][custom-check][NFC] fix test when `CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS` disable #159809