[libc++abi] Fix tests when pstl is enabled
authorLouis Dionne <ldionne@apple.com>
Thu, 8 Aug 2019 12:43:20 +0000 (12:43 +0000)
committerLouis Dionne <ldionne@apple.com>
Thu, 8 Aug 2019 12:43:20 +0000 (12:43 +0000)
llvm-svn: 368286

libcxxabi/test/CMakeLists.txt
libcxxabi/test/lit.site.cfg.in

index 01fae13..60e052d 100644 (file)
@@ -19,6 +19,7 @@ pythonize_bool(LIBCXXABI_ENABLE_EXCEPTIONS)
 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
index 4abb8ed..8ac2fa4 100644 (file)
@@ -26,5 +26,8 @@ config.sysroot                  = "@LIBCXXABI_SYSROOT@"
 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")