This revision was automatically updated to reflect the committed changes.
Closed by commit rL360991: [Analysis] Only run plugins tests if plugins are
actually enabled (authored by phosek, committed by ).
Changed prior to commit:
https://reviews.llvm.org/D62050?vs=199955&id=199977#toc
Repository:
rL LLVM
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D62050/new/
https://reviews.llvm.org/D62050
Files:
cfe/trunk/test/Analysis/checker-plugins.c
cfe/trunk/test/CMakeLists.txt
cfe/trunk/test/lit.cfg.py
cfe/trunk/test/lit.site.cfg.py.in
llvm/trunk/cmake/modules/HandleLLVMOptions.cmake
Index: llvm/trunk/cmake/modules/HandleLLVMOptions.cmake
===================================================================
--- llvm/trunk/cmake/modules/HandleLLVMOptions.cmake
+++ llvm/trunk/cmake/modules/HandleLLVMOptions.cmake
@@ -920,14 +920,10 @@
# Plugin support
# FIXME: Make this configurable.
-if(WIN32 OR CYGWIN)
- if(BUILD_SHARED_LIBS OR LLVM_BUILD_LLVM_DYLIB)
- set(LLVM_ENABLE_PLUGINS ON)
- else()
- set(LLVM_ENABLE_PLUGINS OFF)
- endif()
-else()
+if(BUILD_SHARED_LIBS OR LLVM_BUILD_LLVM_DYLIB)
set(LLVM_ENABLE_PLUGINS ON)
+else()
+ set(LLVM_ENABLE_PLUGINS OFF)
endif()
# By default we should enable LLVM_ENABLE_IDE only for multi-configuration
Index: cfe/trunk/test/CMakeLists.txt
===================================================================
--- cfe/trunk/test/CMakeLists.txt
+++ cfe/trunk/test/CMakeLists.txt
@@ -24,7 +24,8 @@
CLANG_ENABLE_STATIC_ANALYZER
ENABLE_BACKTRACES
HAVE_LIBZ
- LLVM_ENABLE_PER_TARGET_RUNTIME_DIR)
+ LLVM_ENABLE_PER_TARGET_RUNTIME_DIR
+ LLVM_ENABLE_PLUGINS)
configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
Index: cfe/trunk/test/lit.site.cfg.py.in
===================================================================
--- cfe/trunk/test/lit.site.cfg.py.in
+++ cfe/trunk/test/lit.site.cfg.py.in
@@ -27,6 +27,7 @@
config.host_arch = "@HOST_ARCH@"
config.python_executable = "@PYTHON_EXECUTABLE@"
config.use_z3_solver = lit_config.params.get('USE_Z3_SOLVER',
"@USE_Z3_SOLVER@")
+config.has_plugins = @LLVM_ENABLE_PLUGINS@
# 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.
Index: cfe/trunk/test/Analysis/checker-plugins.c
===================================================================
--- cfe/trunk/test/Analysis/checker-plugins.c
+++ cfe/trunk/test/Analysis/checker-plugins.c
@@ -1,9 +1,9 @@
+// REQUIRES: plugins
+
// RUN: %clang_analyze_cc1 -verify %s \
// RUN: -load %llvmshlibdir/SampleAnalyzerPlugin%pluginext \
// RUN: -analyzer-checker='example.MainCallChecker'
-// REQUIRES: plugins
-
// Test that the MainCallChecker example analyzer plugin loads and runs.
int main();
Index: cfe/trunk/test/lit.cfg.py
===================================================================
--- cfe/trunk/test/lit.cfg.py
+++ cfe/trunk/test/lit.cfg.py
@@ -85,13 +85,7 @@
os.path.join(config.clang_tools_dir,
'hmaptool'))))
# Plugins (loadable modules)
-# TODO: This should be supplied by Makefile or autoconf.
-if sys.platform in ['win32', 'cygwin']:
- has_plugins = config.enable_shared
-else:
- has_plugins = True
-
-if has_plugins and config.llvm_plugin_ext:
+if config.has_plugins and config.llvm_plugin_ext:
config.available_features.add('plugins')
# Set available features we allow tests to conditionalize on.
Index: llvm/trunk/cmake/modules/HandleLLVMOptions.cmake
===================================================================
--- llvm/trunk/cmake/modules/HandleLLVMOptions.cmake
+++ llvm/trunk/cmake/modules/HandleLLVMOptions.cmake
@@ -920,14 +920,10 @@
# Plugin support
# FIXME: Make this configurable.
-if(WIN32 OR CYGWIN)
- if(BUILD_SHARED_LIBS OR LLVM_BUILD_LLVM_DYLIB)
- set(LLVM_ENABLE_PLUGINS ON)
- else()
- set(LLVM_ENABLE_PLUGINS OFF)
- endif()
-else()
+if(BUILD_SHARED_LIBS OR LLVM_BUILD_LLVM_DYLIB)
set(LLVM_ENABLE_PLUGINS ON)
+else()
+ set(LLVM_ENABLE_PLUGINS OFF)
endif()
# By default we should enable LLVM_ENABLE_IDE only for multi-configuration
Index: cfe/trunk/test/CMakeLists.txt
===================================================================
--- cfe/trunk/test/CMakeLists.txt
+++ cfe/trunk/test/CMakeLists.txt
@@ -24,7 +24,8 @@
CLANG_ENABLE_STATIC_ANALYZER
ENABLE_BACKTRACES
HAVE_LIBZ
- LLVM_ENABLE_PER_TARGET_RUNTIME_DIR)
+ LLVM_ENABLE_PER_TARGET_RUNTIME_DIR
+ LLVM_ENABLE_PLUGINS)
configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
Index: cfe/trunk/test/lit.site.cfg.py.in
===================================================================
--- cfe/trunk/test/lit.site.cfg.py.in
+++ cfe/trunk/test/lit.site.cfg.py.in
@@ -27,6 +27,7 @@
config.host_arch = "@HOST_ARCH@"
config.python_executable = "@PYTHON_EXECUTABLE@"
config.use_z3_solver = lit_config.params.get('USE_Z3_SOLVER', "@USE_Z3_SOLVER@")
+config.has_plugins = @LLVM_ENABLE_PLUGINS@
# 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.
Index: cfe/trunk/test/Analysis/checker-plugins.c
===================================================================
--- cfe/trunk/test/Analysis/checker-plugins.c
+++ cfe/trunk/test/Analysis/checker-plugins.c
@@ -1,9 +1,9 @@
+// REQUIRES: plugins
+
// RUN: %clang_analyze_cc1 -verify %s \
// RUN: -load %llvmshlibdir/SampleAnalyzerPlugin%pluginext \
// RUN: -analyzer-checker='example.MainCallChecker'
-// REQUIRES: plugins
-
// Test that the MainCallChecker example analyzer plugin loads and runs.
int main();
Index: cfe/trunk/test/lit.cfg.py
===================================================================
--- cfe/trunk/test/lit.cfg.py
+++ cfe/trunk/test/lit.cfg.py
@@ -85,13 +85,7 @@
os.path.join(config.clang_tools_dir, 'hmaptool'))))
# Plugins (loadable modules)
-# TODO: This should be supplied by Makefile or autoconf.
-if sys.platform in ['win32', 'cygwin']:
- has_plugins = config.enable_shared
-else:
- has_plugins = True
-
-if has_plugins and config.llvm_plugin_ext:
+if config.has_plugins and config.llvm_plugin_ext:
config.available_features.add('plugins')
# Set available features we allow tests to conditionalize on.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
