From: Don Hinton Date: Sun, 2 Jun 2019 15:53:43 +0000 (+0000) Subject: [test] Fix plugin tests X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2b2bd3d04782c13871673b7b6d7e238e881d258;p=clang [test] Fix plugin tests Recommit of r361790 that was temporarily reverted in r361793 due to bot breakage. Summary: The following changes were required to fix these tests: 1) Change LLVM_ENABLE_PLUGINS to an option and move it to llvm/CMakeLists.txt with an appropriate default -- which matches the original default behavior. 2) Move the plugins directory from clang/test/Analysis clang/lib/Analysis. It's not enough to add an exclude to the lit.local.cfg file because add_lit_testsuites recurses the tree and automatically adds the appropriate `check-` targets, which don't make sense for the plugins because they aren't tests and don't have `RUN` statements. Here's a list of the `clang-check-anlysis*` targets with this change: ``` $ ninja -t targets all| sed -n "s/.*\/\(check[^:]*\):.*/\1/p" | sort -u | grep clang-analysis check-clang-analysis check-clang-analysis-checkers check-clang-analysis-copypaste check-clang-analysis-diagnostics check-clang-analysis-engine check-clang-analysis-exploration_order check-clang-analysis-html_diagnostics check-clang-analysis-html_diagnostics-relevant_lines check-clang-analysis-inlining check-clang-analysis-objc check-clang-analysis-unified-sources check-clang-analysis-z3 ``` 3) Simplify the logic and only include the subdirectories under clang/lib/Analysis/plugins if LLVM_ENABLE_PLUGINS is set. Reviewed By: NoQ Tags: #clang, #llvm Differential Revision: https://reviews.llvm.org/D62445 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@362328 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Analysis/CMakeLists.txt b/lib/Analysis/CMakeLists.txt index 940a3dfe6f..9271714346 100644 --- a/lib/Analysis/CMakeLists.txt +++ b/lib/Analysis/CMakeLists.txt @@ -34,3 +34,5 @@ add_clang_library(clangAnalysis clangBasic clangLex ) + +add_subdirectory(plugins) diff --git a/lib/Analysis/plugins/CMakeLists.txt b/lib/Analysis/plugins/CMakeLists.txt new file mode 100644 index 0000000000..f7dbc93695 --- /dev/null +++ b/lib/Analysis/plugins/CMakeLists.txt @@ -0,0 +1,5 @@ +if(LLVM_ENABLE_PLUGINS) + add_subdirectory(SampleAnalyzer) + add_subdirectory(CheckerDependencyHandling) + add_subdirectory(CheckerOptionHandling) +endif() diff --git a/test/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt b/lib/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt similarity index 51% rename from test/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt rename to lib/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt index 80e2cdbd3a..0a8ff48755 100644 --- a/test/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt +++ b/lib/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt @@ -1,11 +1,10 @@ set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/CheckerDependencyHandlingAnalyzerPlugin.exports) add_llvm_library(CheckerDependencyHandlingAnalyzerPlugin MODULE CheckerDependencyHandling.cpp PLUGIN_TOOL clang) -if(LLVM_ENABLE_PLUGINS AND (WIN32 OR CYGWIN)) - target_link_libraries(CheckerDependencyHandlingAnalyzerPlugin PRIVATE - clangAnalysis - clangAST - clangStaticAnalyzerCore - LLVMSupport - ) -endif() +target_link_libraries(CheckerDependencyHandlingAnalyzerPlugin PRIVATE + clangAnalysis + clangAST + clangStaticAnalyzerCore + clangStaticAnalyzerFrontend + LLVMSupport + ) diff --git a/test/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandling.cpp b/lib/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandling.cpp similarity index 100% rename from test/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandling.cpp rename to lib/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandling.cpp diff --git a/test/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandlingAnalyzerPlugin.exports b/lib/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandlingAnalyzerPlugin.exports similarity index 100% rename from test/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandlingAnalyzerPlugin.exports rename to lib/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandlingAnalyzerPlugin.exports diff --git a/test/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt b/lib/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt similarity index 50% rename from test/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt rename to lib/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt index 6a1d5e8527..6e289933c2 100644 --- a/test/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt +++ b/lib/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt @@ -1,11 +1,10 @@ set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/CheckerOptionHandlingAnalyzerPlugin.exports) add_llvm_library(CheckerOptionHandlingAnalyzerPlugin MODULE CheckerOptionHandling.cpp PLUGIN_TOOL clang) -if(LLVM_ENABLE_PLUGINS AND (WIN32 OR CYGWIN)) - target_link_libraries(CheckerOptionHandlingAnalyzerPlugin PRIVATE - clangAnalysis - clangAST - clangStaticAnalyzerCore - LLVMSupport - ) -endif() +target_link_libraries(CheckerOptionHandlingAnalyzerPlugin PRIVATE + clangAnalysis + clangAST + clangStaticAnalyzerCore + clangStaticAnalyzerFrontend + LLVMSupport + ) diff --git a/test/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandling.cpp b/lib/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandling.cpp similarity index 100% rename from test/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandling.cpp rename to lib/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandling.cpp diff --git a/test/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandlingAnalyzerPlugin.exports b/lib/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandlingAnalyzerPlugin.exports similarity index 100% rename from test/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandlingAnalyzerPlugin.exports rename to lib/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandlingAnalyzerPlugin.exports diff --git a/lib/Analysis/plugins/SampleAnalyzer/CMakeLists.txt b/lib/Analysis/plugins/SampleAnalyzer/CMakeLists.txt new file mode 100644 index 0000000000..639a97f253 --- /dev/null +++ b/lib/Analysis/plugins/SampleAnalyzer/CMakeLists.txt @@ -0,0 +1,10 @@ +set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/SampleAnalyzerPlugin.exports) +add_llvm_library(SampleAnalyzerPlugin MODULE MainCallChecker.cpp PLUGIN_TOOL clang) + +target_link_libraries(SampleAnalyzerPlugin PRIVATE + clangAnalysis + clangAST + clangStaticAnalyzerCore + clangStaticAnalyzerFrontend + LLVMSupport + ) diff --git a/test/Analysis/plugins/SampleAnalyzer/MainCallChecker.cpp b/lib/Analysis/plugins/SampleAnalyzer/MainCallChecker.cpp similarity index 100% rename from test/Analysis/plugins/SampleAnalyzer/MainCallChecker.cpp rename to lib/Analysis/plugins/SampleAnalyzer/MainCallChecker.cpp diff --git a/test/Analysis/plugins/SampleAnalyzer/SampleAnalyzerPlugin.exports b/lib/Analysis/plugins/SampleAnalyzer/SampleAnalyzerPlugin.exports similarity index 100% rename from test/Analysis/plugins/SampleAnalyzer/SampleAnalyzerPlugin.exports rename to lib/Analysis/plugins/SampleAnalyzer/SampleAnalyzerPlugin.exports diff --git a/test/Analysis/lit.local.cfg b/test/Analysis/lit.local.cfg index b77cae8ece..84f7569152 100644 --- a/test/Analysis/lit.local.cfg +++ b/test/Analysis/lit.local.cfg @@ -18,7 +18,5 @@ config.substitutions.append(('%diff_plist', config.substitutions.append(('%diff_sarif', '''diff -U1 -w -I ".*file:.*%basename_t" -I '"version":' -I "2\.0\.0\-csd\.[0-9]*\.beta\."''')) -config.excludes.add('plugins') - if not config.root.clang_staticanalyzer: config.unsupported = True diff --git a/test/Analysis/plugins/CMakeLists.txt b/test/Analysis/plugins/CMakeLists.txt deleted file mode 100644 index 8d4333f99a..0000000000 --- a/test/Analysis/plugins/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -add_subdirectory(SampleAnalyzer) -add_subdirectory(CheckerDependencyHandling) -add_subdirectory(CheckerOptionHandling) - -set(CLANG_ANALYZER_PLUGIN_DEPS - SampleAnalyzerPlugin - CheckerDependencyHandlingAnalyzerPlugin - CheckerOptionHandlingAnalyzerPlugin - ) - -add_custom_target(clang-analyzer-plugin - DEPENDS ${CLANG_ANALYZER_PLUGIN_DEPS}) diff --git a/test/Analysis/plugins/SampleAnalyzer/CMakeLists.txt b/test/Analysis/plugins/SampleAnalyzer/CMakeLists.txt deleted file mode 100644 index 7c7b2aec19..0000000000 --- a/test/Analysis/plugins/SampleAnalyzer/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/SampleAnalyzerPlugin.exports) -add_llvm_library(SampleAnalyzerPlugin MODULE MainCallChecker.cpp PLUGIN_TOOL clang) - -if(LLVM_ENABLE_PLUGINS AND (WIN32 OR CYGWIN)) - target_link_libraries(SampleAnalyzerPlugin PRIVATE - clangAnalysis - clangAST - clangStaticAnalyzerCore - LLVMSupport - ) -endif() diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 339f637847..04dbaf2e61 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -83,12 +83,6 @@ if (CLANG_BUILD_EXAMPLES) ) endif () -if (CLANG_ENABLE_STATIC_ANALYZER AND CLANG_BUILD_EXAMPLES) - list(APPEND CLANG_TEST_DEPS - SampleAnalyzerPlugin - ) -endif () - set(CLANG_TEST_PARAMS clang_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg USE_Z3_SOLVER=0 @@ -126,27 +120,13 @@ if( NOT CLANG_BUILT_STANDALONE ) endif() if (CLANG_ENABLE_STATIC_ANALYZER) - add_subdirectory(Analysis/plugins) - list(APPEND CLANG_TEST_DEPS clang-analyzer-plugin) - - # check-all would launch those tests via check-clang. - set(EXCLUDE_FROM_ALL ON) - - add_lit_testsuite(check-clang-analyzer "Running the Clang analyzer tests" - ${CMAKE_CURRENT_BINARY_DIR}/Analysis - PARAMS ${ANALYZER_TEST_PARAMS} - DEPENDS ${CLANG_TEST_DEPS}) - set_target_properties(check-clang-analyzer PROPERTIES FOLDER "Clang tests") - - if (LLVM_WITH_Z3) - add_lit_testsuite(check-clang-analyzer-z3 "Running the Clang analyzer tests, using Z3 as a solver" - ${CMAKE_CURRENT_BINARY_DIR}/Analysis - PARAMS ${ANALYZER_TEST_PARAMS_Z3} - DEPENDS ${CLANG_TEST_DEPS}) - set_target_properties(check-clang-analyzer-z3 PROPERTIES FOLDER "Clang tests") + if (LLVM_ENABLE_PLUGINS) + set(CLANG_TEST_DEPS + SampleAnalyzerPlugin + CheckerDependencyHandlingAnalyzerPlugin + CheckerOptionHandlingAnalyzerPlugin + ) endif() - - set(EXCLUDE_FROM_ALL OFF) endif() add_custom_target(clang-test-depends DEPENDS ${CLANG_TEST_DEPS})