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

[sbc100]

Summary

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

[sbc100]

ping

llvm/trunk/test/CMakeLists.txt

 llvm_canonicalize_cmake_booleans(
   LLVM_TOOL_LTO_BUILD
   HAVE_OCAMLOPT
   HAVE_OCAML_OUNIT
   LLVM_INCLUDE_GO_TESTS
   LLVM_USE_INTEL_JITEVENTS
   HAVE_LIBZ
   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
   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
   MAIN_CONFIG
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py
   )
 configure_lit_site_cfg(

llvm/trunk/test/lit.cfg.py

if sys.platform in ['win32', 'cygwin']:
     loadable_module = (config.enable_shared == 1)
 else:
     loadable_module = True
 
 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
 if not 'hexagon' in config.target_triple:
     config.available_features.add('object-emission')
 
 # LLVM can be configured with an empty default triple
 # Some tests are "generic" and require a valid default triple

llvm/trunk/test/lit.site.cfg.py.in

 config.host_ldflags = "@HOST_LDFLAGS@"
 config.llvm_use_intel_jitevents = @LLVM_USE_INTEL_JITEVENTS@
 config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@"
 config.have_zlib = @HAVE_LIBZ@
 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.
 try:
     config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
     config.llvm_shlib_dir = config.llvm_shlib_dir % lit_config.params
 except KeyError:
     e = sys.exc_info()[1]
     key, = e.args
     lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
 
 @LIT_SITE_CFG_IN_FOOTER@
 
 # Let the main config do the real work.
 lit_config.load_config(config, "@LLVM_SOURCE_DIR@/test/lit.cfg.py")