From 6b1420d0f2e642e71e886ecaa88eb4c3bbb40b56 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/libcxx/trunk@353137 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/lit.site.cfg.in | 28 ++++++++++++++-------------- utils/libcxx/test/config.py | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in index cb7b62c9a..019cca8a2 100644 --- a/test/lit.site.cfg.in +++ b/test/lit.site.cfg.in @@ -4,12 +4,12 @@ config.project_obj_root = "@CMAKE_BINARY_DIR@" config.libcxx_src_root = "@LIBCXX_SOURCE_DIR@" config.libcxx_obj_root = "@LIBCXX_BINARY_DIR@" config.cxx_library_root = "@LIBCXX_LIBRARY_DIR@" -config.enable_exceptions = "@LIBCXX_ENABLE_EXCEPTIONS@" -config.enable_experimental = "@LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY@" -config.enable_filesystem = "@LIBCXX_ENABLE_FILESYSTEM@" -config.enable_rtti = "@LIBCXX_ENABLE_RTTI@" -config.enable_shared = "@LIBCXX_ENABLE_SHARED@" -config.enable_32bit = "@LIBCXX_BUILD_32_BITS@" +config.enable_exceptions = @LIBCXX_ENABLE_EXCEPTIONS@ +config.enable_experimental = @LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY@ +config.enable_filesystem = @LIBCXX_ENABLE_FILESYSTEM@ +config.enable_rtti = @LIBCXX_ENABLE_RTTI@ +config.enable_shared = @LIBCXX_ENABLE_SHARED@ +config.enable_32bit = @LIBCXX_BUILD_32_BITS@ config.cxx_abi = "@LIBCXX_CXX_ABI_LIBNAME@" config.use_sanitizer = "@LLVM_USE_SANITIZER@" config.sanitizer_library = "@LIBCXX_SANITIZER_LIBRARY@" @@ -20,19 +20,19 @@ config.target_triple = "@TARGET_TRIPLE@" config.use_target = bool("@LIBCXX_TARGET_TRIPLE@") config.sysroot = "@LIBCXX_SYSROOT@" config.gcc_toolchain = "@LIBCXX_GCC_TOOLCHAIN@" -config.generate_coverage = "@LIBCXX_GENERATE_COVERAGE@" +config.generate_coverage = @LIBCXX_GENERATE_COVERAGE@ config.target_info = "@LIBCXX_TARGET_INFO@" config.test_linker_flags = "@LIBCXX_TEST_LINKER_FLAGS@" config.test_compiler_flags = "@LIBCXX_TEST_COMPILER_FLAGS@" config.executor = "@LIBCXX_EXECUTOR@" -config.llvm_unwinder = "@LIBCXXABI_USE_LLVM_UNWINDER@" -config.compiler_rt = "@LIBCXX_USE_COMPILER_RT@" -config.has_libatomic = "@LIBCXX_HAS_ATOMIC_LIB@" -config.use_libatomic = "@LIBCXX_HAVE_CXX_ATOMICS_WITH_LIB@" -config.debug_build = "@LIBCXX_DEBUG_BUILD@" -config.libcxxabi_shared = "@LIBCXXABI_ENABLE_SHARED@" -config.cxx_ext_threads = "@LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY@" +config.llvm_unwinder = @LIBCXXABI_USE_LLVM_UNWINDER@ +config.compiler_rt = @LIBCXX_USE_COMPILER_RT@ +config.has_libatomic = @LIBCXX_HAS_ATOMIC_LIB@ +config.use_libatomic = @LIBCXX_HAVE_CXX_ATOMICS_WITH_LIB@ +config.debug_build = @LIBCXX_DEBUG_BUILD@ +config.libcxxabi_shared = @LIBCXXABI_ENABLE_SHARED@ +config.cxx_ext_threads = @LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY@ # Let the main config do the real work. config.loaded_site_config = True diff --git a/utils/libcxx/test/config.py b/utils/libcxx/test/config.py index aba1ada90..a16bbdef5 100644 --- a/utils/libcxx/test/config.py +++ b/utils/libcxx/test/config.py @@ -547,10 +547,10 @@ class Configuration(object): self.cxx.flags += ['-v'] sysroot = self.get_lit_conf('sysroot') if sysroot: - self.cxx.flags += ['--sysroot', sysroot] + self.cxx.flags += ['--sysroot=' + sysroot] gcc_toolchain = self.get_lit_conf('gcc_toolchain') if gcc_toolchain: - self.cxx.flags += ['-gcc-toolchain', gcc_toolchain] + self.cxx.flags += ['--gcc-toolchain=' + gcc_toolchain] # NOTE: the _DEBUG definition must preceed the triple check because for # the Windows build of libc++, the forced inclusion of a header requires # that _DEBUG is defined. Incorrect ordering will result in -target @@ -559,8 +559,8 @@ class Configuration(object): self.cxx.compile_flags += ['-D_DEBUG'] if self.use_target: if not self.cxx.addFlagIfSupported( - ['-target', self.config.target_triple]): - self.lit_config.warning('use_target is true but -target is '\ + ['--target=' + self.config.target_triple]): + self.lit_config.warning('use_target is true but --target is '\ 'not supported by the compiler') if self.use_deployment: arch, name, version = self.config.deployment -- cgit v1.2.3