Don't set static-libs test feature when using LLVM_LINK_LLVM_DYLIB

This was causing execname-options.ll to fail on the wasm
waterfall.

Differential Revision: https://reviews.llvm.org/D39022

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@316123 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 33e5da0eb1bb288eace18544453823783da23275..efb43955d57dcecf2bf17af7e02c37faa1fc1182 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -8,7 +8,9 @@ llvm_canonicalize_cmake_booleans(
   HAVE_LIBXAR
   LLVM_ENABLE_DIA_SDK
   LLVM_ENABLE_FFI
-  BUILD_SHARED_LIBS)
+  BUILD_SHARED_LIBS
+  LLVM_LINK_LLVM_DYLIB
+  )
 
 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in

diff --git a/test/lit.cfg.py b/test/lit.cfg.py
index 7b935c19558d8bd90e80494bb5588ed66a07fb14..6a5cf69b9876a93b2d817016f186d3fdd01c9338 100644 (file)
--- a/test/lit.cfg.py
+++ b/test/lit.cfg.py
@@ -185,7 +185,7 @@ if loadable_module:
     config.available_features.add('loadable_module')
 
 # Static libraries are not built if BUILD_SHARED_LIBS is ON.
-if not config.build_shared_libs:
+if not config.build_shared_libs and not config.link_llvm_dylib:
     config.available_features.add('static-libs')
 
 # Direct object generation

diff --git a/test/lit.site.cfg.py.in b/test/lit.site.cfg.py.in
index 45f265afb97b8e5c2e4cf36000e7f26f6e610a59..a1fd05385974d1d741a4fb125a24c84495b34f2a 100644 (file)
--- a/test/lit.site.cfg.py.in
+++ b/test/lit.site.cfg.py.in
@@ -40,7 +40,8 @@ config.have_libxar = @HAVE_LIBXAR@
 config.have_dia_sdk = @LLVM_ENABLE_DIA_SDK@
 config.enable_ffi = @LLVM_ENABLE_FFI@
 config.build_shared_libs = @BUILD_SHARED_LIBS@
-config.llvm_libxml2_enabled = "@LLVM_LIBXML2_ENABLED@"
+config.link_llvm_dylib = @LLVM_LINK_LLVM_DYLIB@
+config.llvm_libxml2_enabled = @LLVM_LIBXML2_ENABLED@
 
 # Support substitution of the tools_dir with user parameters. This is
 # used when we can't determine the tool dir at configuration time.