[libcxx-commits] [libcxxabi] r368286 - [libc++abi] Fix tests when pstl is enabled
Louis Dionne via libcxx-commits
libcxx-commits at lists.llvm.org
Thu Aug 8 05:43:20 PDT 2019
Author: ldionne
Date: Thu Aug 8 05:43:20 2019
New Revision: 368286
URL: http://llvm.org/viewvc/llvm-project?rev=368286&view=rev
Log:
[libc++abi] Fix tests when pstl is enabled
Modified:
libcxxabi/trunk/test/CMakeLists.txt
libcxxabi/trunk/test/lit.site.cfg.in
Modified: libcxxabi/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/test/CMakeLists.txt?rev=368286&r1=368285&r2=368286&view=diff
==============================================================================
--- libcxxabi/trunk/test/CMakeLists.txt (original)
+++ libcxxabi/trunk/test/CMakeLists.txt Thu Aug 8 05:43:20 2019
@@ -19,6 +19,7 @@ pythonize_bool(LIBCXXABI_ENABLE_EXCEPTIO
pythonize_bool(LIBCXXABI_USE_LLVM_UNWINDER)
pythonize_bool(LIBCXXABI_USE_COMPILER_RT)
pythonize_bool(LIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY)
+pythonize_bool(LIBCXX_ENABLE_PARALLEL_ALGORITHMS)
set(LIBCXXABI_TARGET_INFO "libcxx.test.target_info.LocalTI" CACHE STRING
"TargetInfo to use when setting up test environment.")
set(LIBCXXABI_EXECUTOR "None" CACHE STRING
Modified: libcxxabi/trunk/test/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/test/lit.site.cfg.in?rev=368286&r1=368285&r2=368286&view=diff
==============================================================================
--- libcxxabi/trunk/test/lit.site.cfg.in (original)
+++ libcxxabi/trunk/test/lit.site.cfg.in Thu Aug 8 05:43:20 2019
@@ -26,5 +26,8 @@ config.sysroot = "@LIBC
config.gcc_toolchain = "@LIBCXXABI_GCC_TOOLCHAIN@"
config.cxx_ext_threads = @LIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY@
+config.pstl_src_root = "@ParallelSTL_SOURCE_DIR@" if @LIBCXX_ENABLE_PARALLEL_ALGORITHMS@ else None
+config.pstl_obj_root = "@ParallelSTL_BINARY_DIR@" if @LIBCXX_ENABLE_PARALLEL_ALGORITHMS@ else None
+
# Let the main config do the real work.
lit_config.load_config(config, "@LIBCXXABI_SOURCE_DIR@/test/lit.cfg")
More information about the libcxx-commits
mailing list