079bd3253f
Resolves: rhbz#2061041 Resolves: rhbz#2061058
62 lines
3.1 KiB
Diff
62 lines
3.1 KiB
Diff
diff -ruN a/clang-tools-extra-14.0.0rc2.src.orig/test/clang-tidy/CTTestTidyModule.cpp a/clang-tools-extra-14.0.0rc2.src/test/clang-tidy/CTTestTidyModule.cpp
|
|
--- a/clang-tools-extra-14.0.0rc2.src.orig/test/clang-tidy/CTTestTidyModule.cpp 2022-03-02 01:46:37.000000000 +0100
|
|
+++ a/clang-tools-extra-14.0.0rc2.src/test/clang-tidy/CTTestTidyModule.cpp 2022-03-07 08:52:20.009112976 +0100
|
|
@@ -1,4 +1,4 @@
|
|
-// REQUIRES: plugins
|
|
+// REQUIRES: plugins, llvm-hello
|
|
// RUN: clang-tidy -checks='-*,mytest*' --list-checks -load %llvmshlibdir/CTTestTidyModule%pluginext -load %llvmshlibdir/LLVMHello%pluginext | FileCheck --check-prefix=CHECK-LIST %s
|
|
// CHECK-LIST: Enabled checks:
|
|
// CHECK-LIST-NEXT: mytest1
|
|
diff -ruN a/clang-tools-extra-14.0.0rc2.src.orig/test/CMakeLists.txt a/clang-tools-extra-14.0.0rc2.src/test/CMakeLists.txt
|
|
--- a/clang-tools-extra-14.0.0rc2.src.orig/test/CMakeLists.txt 2022-03-02 01:46:37.000000000 +0100
|
|
+++ a/clang-tools-extra-14.0.0rc2.src/test/CMakeLists.txt 2022-03-07 10:58:56.172490672 +0100
|
|
@@ -15,10 +15,15 @@
|
|
|
|
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} CLANG_TOOLS_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
|
|
|
|
+if (TARGET LLVMHello)
|
|
+ set (LLVM_HAS_LLVM_HELLO 1)
|
|
+endif()
|
|
+
|
|
llvm_canonicalize_cmake_booleans(
|
|
CLANG_TIDY_ENABLE_STATIC_ANALYZER
|
|
CLANG_PLUGIN_SUPPORT
|
|
LLVM_INSTALL_TOOLCHAIN_ONLY
|
|
+ LLVM_HAS_LLVM_HELLO
|
|
)
|
|
|
|
configure_lit_site_cfg(
|
|
@@ -97,7 +102,10 @@
|
|
endif()
|
|
|
|
if(TARGET CTTestTidyModule)
|
|
- list(APPEND CLANG_TOOLS_TEST_DEPS CTTestTidyModule LLVMHello)
|
|
+ list(APPEND CLANG_TOOLS_TEST_DEPS CTTestTidyModule)
|
|
+ if (TARGET LLVMHello)
|
|
+ list(APPEND CLANG_TOOLS_TEST_DEPS CTTestTidyModule) # Should be LLVMHello?
|
|
+ endif()
|
|
target_include_directories(CTTestTidyModule PUBLIC BEFORE "${CLANG_TOOLS_SOURCE_DIR}")
|
|
if(CLANG_PLUGIN_SUPPORT AND (WIN32 OR CYGWIN))
|
|
set(LLVM_LINK_COMPONENTS
|
|
diff -ruN a/clang-tools-extra-14.0.0rc2.src.orig/test/lit.cfg.py a/clang-tools-extra-14.0.0rc2.src/test/lit.cfg.py
|
|
--- a/clang-tools-extra-14.0.0rc2.src.orig/test/lit.cfg.py 2022-03-02 01:46:37.000000000 +0100
|
|
+++ a/clang-tools-extra-14.0.0rc2.src/test/lit.cfg.py 2022-03-07 08:52:20.010112983 +0100
|
|
@@ -155,3 +155,6 @@
|
|
# Plugins (loadable modules)
|
|
if config.has_plugins and config.llvm_plugin_ext:
|
|
config.available_features.add('plugins')
|
|
+
|
|
+if config.has_llvm_hello:
|
|
+ config.available_features.add('llvm-hello')
|
|
diff -ruN a/clang-tools-extra-14.0.0rc2.src.orig/test/lit.site.cfg.py.in a/clang-tools-extra-14.0.0rc2.src/test/lit.site.cfg.py.in
|
|
--- a/clang-tools-extra-14.0.0rc2.src.orig/test/lit.site.cfg.py.in 2022-03-02 01:46:37.000000000 +0100
|
|
+++ a/clang-tools-extra-14.0.0rc2.src/test/lit.site.cfg.py.in 2022-03-07 10:59:17.202663983 +0100
|
|
@@ -13,6 +13,7 @@
|
|
config.target_triple = "@TARGET_TRIPLE@"
|
|
config.clang_tidy_staticanalyzer = @CLANG_TIDY_ENABLE_STATIC_ANALYZER@
|
|
config.has_plugins = @CLANG_PLUGIN_SUPPORT@ & ~@LLVM_INSTALL_TOOLCHAIN_ONLY@
|
|
+config.has_llvm_hello = @LLVM_HAS_LLVM_HELLO@
|
|
|
|
# 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.
|