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

[danalbert]

CMakeLists.txt

17

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

[jroelofs]

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

[danalbert]

CMakeLists.txt

51

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]

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 :(

CMakeLists.txt

 macro(pythonize_bool var)
   if (${var})
     set(${var} True)
   else()
     set(${var} False)
   endif()
 endmacro()
 
-include(FindPythonInterp)
-if(PYTHONINTERP_FOUND)
-  if(LIBCXX_BUILT_STANDALONE)
-    set(LIT_EXECUTABLE "" CACHE FILEPATH "Path to LLVM's lit.py.")
-  else()
-    set(LIT_EXECUTABLE "${CMAKE_SOURCE_DIR}/utils/lit/lit.py")
-  endif()
 
-  set(LIT_ARGS_DEFAULT "-sv --show-unsupported --show-xfail")
-  if (MSVC OR XCODE)
-    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)
+# Make sure we can use the console pool for recent cmake and ninja > 1.5
+if(CMAKE_VERSION VERSION_LESS 3.1.20141117)
+  set(cmake_3_2_USES_TERMINAL)
+else()
+  set(cmake_3_2_USES_TERMINAL USES_TERMINAL)
+endif()
+
 
-  set(LIBCXX_LIT_VARIANT "libcxx" CACHE STRING
-      "Configuration variant to use for LIT.")
-
-  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)
+pythonize_bool(LIBCXX_ENABLE_SHARED)
 
-  set(AUTO_GEN_COMMENT "## Autogenerated by libcxx configuration.\n# Do not edit!")
+set(LIBCXX_LIT_VARIANT "libcxx" CACHE STRING
+    "Configuration variant to use for LIT.")
 
-  configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
-    ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
-    @ONLY)
+set(AUTO_GEN_COMMENT "## Autogenerated by libcxx configuration.\n# Do not edit!")
 
-  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()
+
+add_lit_testsuite(check-libcxx "Running libcxx tests"
+  ${cmake_3_2_USES_TERMINAL}
+  )