Author: ericwf
Date: Wed Mar 1 15:53:30 2017
New Revision: 296685
URL: http://llvm.org/viewvc/llvm-project?rev=296685&view=rev
Log:
Generate the test configuration even when LIBCXX_INCLUDE_TESTS=OFF.
This patch changes the CMake configuration so that it always
generates the test/lit.site.cfg file, even when testing is disabled.
This allows users to test libc++ without requiring them to have
a full LLVM checkout on their machine.
Modified:
libcxx/trunk/CMakeLists.txt
libcxx/trunk/test/CMakeLists.txt
Modified: libcxx/trunk/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=296685&r1=296684&r2=296685&view=diff
==============================================================================
--- libcxx/trunk/CMakeLists.txt (original)
+++ libcxx/trunk/CMakeLists.txt Wed Mar 1 15:53:30 2017
@@ -19,7 +19,6 @@ set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH}
)
-
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
project(libcxx CXX C)
@@ -600,10 +599,15 @@ add_subdirectory(lib)
if (LIBCXX_INCLUDE_BENCHMARKS)
add_subdirectory(benchmarks)
endif()
+
+# Create the lit.site.cfg file even when LIBCXX_INCLUDE_TESTS is OFF or
+# LLVM_FOUND is OFF. This allows users to run the tests manually using
+# LIT without requiring a full LLVM checkout.
+add_subdirectory(test)
if (LIBCXX_INCLUDE_TESTS)
- add_subdirectory(test)
add_subdirectory(lib/abi)
endif()
+
if (LIBCXX_INCLUDE_DOCS)
add_subdirectory(docs)
endif()
Modified: libcxx/trunk/test/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/CMakeLists.txt?rev=296685&r1=296684&r2=296685&view=diff
==============================================================================
--- libcxx/trunk/test/CMakeLists.txt (original)
+++ libcxx/trunk/test/CMakeLists.txt Wed Mar 1 15:53:30 2017
@@ -1,5 +1,3 @@
-include(AddLLVM) # for add_lit_testsuite
-
macro(pythonize_bool var)
if (${var})
set(${var} True)
@@ -66,12 +64,15 @@ if (LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY
list(APPEND LIBCXX_TEST_DEPS cxx_external_threads)
endif()
-add_lit_testsuite(check-cxx
- "Running libcxx tests"
- ${CMAKE_CURRENT_BINARY_DIR}
- DEPENDS cxx ${LIBCXX_TEST_DEPS})
+if (LIBCXX_INCLUDE_TESTS)
+ include(AddLLVM) # for add_lit_testsuite
+ add_lit_testsuite(check-cxx
+ "Running libcxx tests"
+ ${CMAKE_CURRENT_BINARY_DIR}
+ DEPENDS cxx ${LIBCXX_TEST_DEPS})
-add_custom_target(check-libcxx DEPENDS check-cxx)
+ add_custom_target(check-libcxx DEPENDS check-cxx)
+endif()
if (LIBCXX_GENERATE_COVERAGE)
include(CodeCoverage)
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
