Author: phosek
Date: Mon Feb 4 20:44:03 2019
New Revision: 353137
URL: http://llvm.org/viewvc/llvm-project?rev=353137&view=rev
Log:
[CMake] Update lit test configuration
There are several changes:
- Don't stringify Pythonized bools (that's why we're Pythonizing them)
- Support specifying target and sysroot via CMake variables
- Use consistent spelling for --target, --sysroot, --gcc-toolchain
Modified:
libunwind/trunk/test/CMakeLists.txt
libunwind/trunk/test/lit.site.cfg.in
Modified: libunwind/trunk/test/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/libunwind/trunk/test/CMakeLists.txt?rev=353137&r1=353136&r2=353137&view=diff
==============================================================================
--- libunwind/trunk/test/CMakeLists.txt (original)
+++ libunwind/trunk/test/CMakeLists.txt Mon Feb 4 20:44:03 2019
@@ -16,6 +16,7 @@ pythonize_bool(LIBCXX_ENABLE_SHARED)
pythonize_bool(LIBUNWIND_ENABLE_SHARED)
pythonize_bool(LIBUNWIND_ENABLE_THREADS)
pythonize_bool(LIBUNWIND_ENABLE_EXCEPTIONS)
+pythonize_bool(LIBUNWIND_USE_COMPILER_RT)
pythonize_bool(LIBUNWIND_BUILD_EXTERNAL_THREAD_LIBRARY)
set(LIBUNWIND_TARGET_INFO "libcxx.test.target_info.LocalTI" CACHE STRING
"TargetInfo to use when setting up test environment.")
Modified: libunwind/trunk/test/lit.site.cfg.in
URL:
http://llvm.org/viewvc/llvm-project/libunwind/trunk/test/lit.site.cfg.in?rev=353137&r1=353136&r2=353137&view=diff
==============================================================================
--- libunwind/trunk/test/lit.site.cfg.in (original)
+++ libunwind/trunk/test/lit.site.cfg.in Mon Feb 4 20:44:03 2019
@@ -7,23 +7,24 @@ config.abi_library_path = "@LIBU
config.libcxx_src_root = "@LIBUNWIND_LIBCXX_PATH@"
config.libunwind_headers = "@LIBUNWIND_SOURCE_DIR@/include"
config.cxx_library_root = "@LIBUNWIND_LIBCXX_LIBRARY_PATH@"
-config.llvm_unwinder = "1"
-config.enable_threads = "@LIBUNWIND_ENABLE_THREADS@"
+config.llvm_unwinder = True
+config.compiler_rt = @LIBUNWIND_USE_COMPILER_RT@
+config.enable_threads = @LIBUNWIND_ENABLE_THREADS@
config.use_sanitizer = "@LLVM_USE_SANITIZER@"
-config.enable_32bit = "@LIBUNWIND_BUILD_32_BITS@"
+config.enable_32bit = @LIBUNWIND_BUILD_32_BITS@
config.target_info = "@LIBUNWIND_TARGET_INFO@"
config.test_linker_flags = "@LIBUNWIND_TEST_LINKER_FLAGS@"
config.test_compiler_flags = "@LIBUNWIND_TEST_COMPILER_FLAGS@"
config.executor = "@LIBUNWIND_EXECUTOR@"
-config.libunwind_shared = "@LIBUNWIND_ENABLE_SHARED@"
-config.enable_shared = "@LIBCXX_ENABLE_SHARED@"
-config.enable_exceptions = "@LIBUNWIND_ENABLE_EXCEPTIONS@"
+config.libunwind_shared = @LIBUNWIND_ENABLE_SHARED@
+config.enable_shared = @LIBCXX_ENABLE_SHARED@
+config.enable_exceptions = @LIBUNWIND_ENABLE_EXCEPTIONS@
config.host_triple = "@LLVM_HOST_TRIPLE@"
config.target_triple = "@TARGET_TRIPLE@"
config.use_target = bool("@LIBUNWIND_TARGET_TRIPLE@")
config.sysroot = "@LIBUNWIND_SYSROOT@"
config.gcc_toolchain = "@LIBUNWIND_GCC_TOOLCHAIN@"
-config.cxx_ext_threads = "@LIBUNWIND_BUILD_EXTERNAL_THREAD_LIBRARY@"
+config.cxx_ext_threads = @LIBUNWIND_BUILD_EXTERNAL_THREAD_LIBRARY@
# Let the main config do the real work.
lit_config.load_config(config, "@LIBUNWIND_SOURCE_DIR@/test/lit.cfg")
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
