Skip to content

Commit 2abe074

Browse files
ldionneliujinye-sys
authored andcommitted
[libc++abi] Fix tests when pstl is enabled
llvm-svn: 368286
1 parent 2c97dd6 commit 2abe074

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

test/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ pythonize_bool(LIBCXXABI_ENABLE_EXCEPTIONS)
1919
pythonize_bool(LIBCXXABI_USE_LLVM_UNWINDER)
2020
pythonize_bool(LIBCXXABI_USE_COMPILER_RT)
2121
pythonize_bool(LIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY)
22+
pythonize_bool(LIBCXX_ENABLE_PARALLEL_ALGORITHMS)
2223
set(LIBCXXABI_TARGET_INFO "libcxx.test.target_info.LocalTI" CACHE STRING
2324
"TargetInfo to use when setting up test environment.")
2425
set(LIBCXXABI_EXECUTOR "None" CACHE STRING

test/lit.site.cfg.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,8 @@ config.sysroot = "@LIBCXXABI_SYSROOT@"
2626
config.gcc_toolchain = "@LIBCXXABI_GCC_TOOLCHAIN@"
2727
config.cxx_ext_threads = @LIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY@
2828

29+
config.pstl_src_root = "@ParallelSTL_SOURCE_DIR@" if @LIBCXX_ENABLE_PARALLEL_ALGORITHMS@ else None
30+
config.pstl_obj_root = "@ParallelSTL_BINARY_DIR@" if @LIBCXX_ENABLE_PARALLEL_ALGORITHMS@ else None
31+
2932
# Let the main config do the real work.
3033
lit_config.load_config(config, "@LIBCXXABI_SOURCE_DIR@/test/lit.cfg")

0 commit comments

Comments
 (0)