From a2f706e6413d0606c29c6e80961f1f3c0a90ef9e Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Tue, 5 Feb 2019 04:44:03 +0000 Subject: [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 git-svn-id: https://llvm.org/svn/llvm-project/libunwind/trunk@353137 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/CMakeLists.txt | 1 + test/lit.site.cfg.in | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 97917b8..d902e3e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -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.") diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in index 2532a3e..4b4cb7e 100644 --- a/test/lit.site.cfg.in +++ b/test/lit.site.cfg.in @@ -7,23 +7,24 @@ config.abi_library_path = "@LIBUNWIND_LIBRARY_DIR@" 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") -- cgit v1.2.3