[Builtins] Fix lit test setup for Windows

[weimingz]

Summary

Use .lib suffix for Windows and .a for non-Windows

[weimingz]

Not sure if it is the portable way to do.
I see cmake/base-config-ix.cmake has set(CMAKE_STATIC_LIBRARY_SUFFIX_C ".lib"), but I can't find where the variable is used and not sure if we can use it in test/CMakefile.

[rnk]

test/builtins/CMakeLists.txt

22

I think you want if (MSVC) here instead.

Can we just ask CMake for the filename of the target and substitute that in? CMake already knows this platform-specific logic.

If we can't do that, it's probably simplest to add is_msvc = @MSVC@ to lit.site.cfg.in and push this conditional path computation logic down into lit.cfg. We might need to pythonize the MSVC bool, though, or it'll come out as ON/OFF.

test/builtins/Unit/lit.cfg

34

The correct filename is actually clang_rt.builtins-%s.lib, without the lib prefix.

[weimingz]

I tried to use the lib name from cmake/Module/AddCompilerRT.cmake : add_compiler_rt_runtime but no luck.
And I can't find where the suffix is set in compiler-rt project.

[rnk]

test/builtins/Unit/lit.site.cfg.in

7

This might become the strings "ON", "", or "OFF", I'm not sure which. I'd rather follow the example of SANITIZER_CAN_USE_CXXABI and use pythonize_bool(MSVC) in test/builtins/CMakeLists.txt and @MSVC_PYBOOL@ here.

[rnk]

There were enough issues with running lit tests on Windows that I went ahead and fixed them in a series of changes. We can close this.

[weimingz]

Thanks for the info!

[weimingz]

btw, should we use "--rtlib=compiler-rt" rather than passing the libname explicitly?

test/builtins/CMakeLists.txt

 set(BUILTINS_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 set(BUILTINS_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS} builtins)
 set(BUILTINS_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/TestCases)
 
 # Test cases.
 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
 )
 
 #Unit tests.
 
 include(builtin-config-ix)
 
+pythonize_bool(MSVC)
+
 #TODO: Add support for Apple.
 if (NOT APPLE)
 foreach(arch ${BUILTIN_SUPPORTED_ARCH})
   set(BUILTINS_TEST_TARGET_ARCH ${arch})
   string(TOLOWER "-${arch}-${OS_NAME}" BUILTINS_TEST_CONFIG_SUFFIX)
   get_test_cc_for_arch(${arch} BUILTINS_TEST_TARGET_CC BUILTINS_TEST_TARGET_CFLAGS)
   if (${arch} STREQUAL "armhf")
     list(APPEND BUILTINS_TEST_TARGET_CFLAGS -fomit-frame-pointer -DCOMPILER_RT_ARMHF_TARGET)
     string(REPLACE ";" " " BUILTINS_TEST_TARGET_CFLAGS "${BUILTINS_TEST_TARGET_CFLAGS}")
   endif()
 
   string(TOUPPER ${arch} ARCH_UPPER_CASE)
   set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}Config)

test/builtins/Unit/lit.cfg

 
 # Platform-specific default Builtins_OPTIONS for lit tests.
 default_builtins_opts = ''
 
 # Setup source root.
 config.test_source_root = os.path.dirname(__file__)
 
 # Path to the static library
-base_lib = os.path.join(config.compiler_rt_libdir, "libclang_rt.builtins-%s.a "
+is_msvc = getattr(config, "builtins_is_msvc", False)
+if is_msvc:
+  base_lib = os.path.join(config.compiler_rt_libdir, "clang_rt.builtins-%s.lib"
+    % config.target_arch)
+else:
+  base_lib = os.path.join(config.compiler_rt_libdir, "libclang_rt.builtins-%s.a"
     % config.target_arch)
 
 builtins_source_dir = os.path.join(
   get_required_attr(config, "compiler_rt_src_root"), "lib", "builtins")
 builtins_lit_source_dir = get_required_attr(config, "builtins_lit_source_dir")
 
 extra_link_flags = ["-nodefaultlibs"]
 config.substitutions.append( ("%librt ", base_lib + ' -lc -lm ') )
 
 target_cflags = [get_required_attr(config, "target_cflags")]

test/builtins/Unit/lit.site.cfg.in

 @LIT_SITE_CFG_IN_HEADER@
 
 config.name_suffix = "@BUILTINS_TEST_CONFIG_SUFFIX@"
 config.builtins_lit_source_dir = "@BUILTINS_LIT_SOURCE_DIR@/Unit"
 config.target_cflags = "@BUILTINS_TEST_TARGET_CFLAGS@"
 config.target_arch = "@BUILTINS_TEST_TARGET_ARCH@"
-
+config.builtins_is_msvc = @MSVC_PYBOOL@
 # Load common config for all compiler-rt lit tests.
 lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
 
 # Load tool-specific config that would do the real work.
 lit_config.load_config(config, "@BUILTINS_LIT_SOURCE_DIR@/Unit/lit.cfg")