This is an archive of the discontinued LLVM Phabricator instance.

Differential D7110

Upgrade libc++'s test's CMakeLists.txt to be in sync with libc++abi's
AbandonedPublic

Authored by jroelofs on Jan 21 2015, 3:37 PM.

Details

Reviewers
danalbert

Diff Detail

Event Timeline

jroelofs updated this revision to Diff 18562.Jan 21 2015, 3:37 PM
jroelofs retitled this revision from to Upgrade libc++'s test's CMakeLists.txt to be in sync with libc++abi's.
jroelofs updated this object.
jroelofs edited the test plan for this revision. (Show Details)
jroelofs added a reviewer: danalbert.
jroelofs added a subscriber: Unknown Object (MLST).
danalbert added inline comments.Jan 21 2015, 3:42 PM
CMakeLists.txt
17

We probably want to keep the configuration for the default args (and the assignment to LLVM_LIT_ARGS).

jroelofs updated this revision to Diff 18640.Jan 22 2015, 3:17 PM

Address @danalbert's comment about the default lit args.

danalbert added inline comments.Jan 22 2015, 3:47 PM
CMakeLists.txt
44

As I read the implementation of add_lit_testsuite this will actually pass the args twice (LLVM_LIT_ARGS is passed implicitly, thank you, global scope!).

jroelofs updated this revision to Diff 18675.Jan 23 2015, 6:59 AM

Rebase. Address @danalbert's comment.

I don't have cmake 3.2, so I can't check that the thing added in the rebase still works :(

jroelofs abandoned this revision.Jul 14 2015, 4:14 PM

Revision Contents

PathSize
57 lines

Diff 18562

CMakeLists.txt

Context not available.
endif() endif()
endmacro() endmacro()
include(FindPythonInterp) pythonize_bool(LIBCXX_ENABLE_EXCEPTIONS)
if(PYTHONINTERP_FOUND) pythonize_bool(LIBCXX_ENABLE_RTTI)
if(LIBCXX_BUILT_STANDALONE) pythonize_bool(LIBCXX_BUILD_32_BITS)
set(LIT_EXECUTABLE "" CACHE FILEPATH "Path to LLVM's lit.py.") pythonize_bool(LIBCXX_ENABLE_SHARED)
else() pythonize_bool(LIBCXX_ENABLE_THREADS)
set(LIT_EXECUTABLE "${CMAKE_SOURCE_DIR}/utils/lit/lit.py") pythonize_bool(LIBCXX_ENABLE_MONOTONIC_CLOCK)
endif()
set(LIT_ARGS_DEFAULT "-sv --show-unsupported --show-xfail") set(LIBCXX_LIT_VARIANT "libcxx" CACHE STRING
danalbertUnsubmitted
Not Done
ReplyInline Actions

We probably want to keep the configuration for the default args (and the assignment to LLVM_LIT_ARGS).

danalbert: We probably want to keep the configuration for the default args (and the assignment to…
if (MSVC OR XCODE) "Configuration variant to use for LIT.")
set(LIT_ARGS_DEFAULT "${LIT_ARGS_DEFAULT} --no-progress-bar")
endif()
set(LLVM_LIT_ARGS "${LIT_ARGS_DEFAULT}"
CACHE STRING "Default options for lit")
set(LIT_ARGS "${LLVM_LIT_ARGS}")
separate_arguments(LIT_ARGS)
set(LIBCXX_LIT_VARIANT "libcxx" CACHE STRING set(AUTO_GEN_COMMENT "## Autogenerated by libcxx configuration.\n# Do not edit!")
"Configuration variant to use for LIT.") configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
@ONLY)
pythonize_bool(LIBCXX_ENABLE_EXCEPTIONS)
pythonize_bool(LIBCXX_ENABLE_RTTI)
pythonize_bool(LIBCXX_ENABLE_SHARED)
pythonize_bool(LIBCXX_BUILD_32_BITS)
pythonize_bool(LIBCXX_ENABLE_THREADS)
pythonize_bool(LIBCXX_ENABLE_MONOTONIC_CLOCK)
set(AUTO_GEN_COMMENT "## Autogenerated by libcxx configuration.\n# Do not edit!") add_lit_testsuite(check-libcxx "Running libcxx tests"
${CMAKE_CURRENT_BINARY_DIR}
configure_file( DEPENDS cxx
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in )
danalbertUnsubmitted
Not Done
ReplyInline Actions

As I read the implementation of add_lit_testsuite this will actually pass the args twice (LLVM_LIT_ARGS is passed implicitly, thank you, global scope!).

danalbert: As I read the implementation of `add_lit_testsuite` this will actually pass the args twice…
${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
@ONLY)
add_custom_target(check-libcxx
COMMAND ${PYTHON_EXECUTABLE}
${LIT_EXECUTABLE}
${LIT_ARGS}
${CMAKE_CURRENT_BINARY_DIR}
DEPENDS cxx
COMMENT "Running libcxx tests")
else()
message(WARNING "Could not find Python, no check target will be available!")
endif()
Context not available.