diff options
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | docs/CMake.html | 7 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 5 |
3 files changed, 18 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c2a9430c9a..a028edf774 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,6 +89,13 @@ set(C_INCLUDE_DIRS "" CACHE STRING set(LLVM_TARGET_ARCH "host" CACHE STRING "Set target to use for LLVM JIT or use \"host\" for automatic detection.") +set(LIT_ARGS_DEFAULT "-sv") +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") + option(LLVM_ENABLE_THREADS "Use threads if available." ON) if( uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE" ) diff --git a/docs/CMake.html b/docs/CMake.html index 2f2af24f6f..e2dac2e314 100644 --- a/docs/CMake.html +++ b/docs/CMake.html @@ -325,6 +325,13 @@ <dd>Full path to a native TableGen executable (usually named <i>tblgen</i>). This is intented for cross-compiling: if the user sets this variable, no native TableGen will be created.</dd> + + <dt><b>LLVM_LIT_ARGS</b>:STRING</dt> + <dd>Arguments given to lit. + <tt>make check</tt> and <tt>make clang-test</tt> are affected. + By default, <tt>"-sv --no-progress-bar"</tt> + on Visual C++ and Xcode, + <tt>"-sv"</tt> on others.</dd> </dl> </div> diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 3828057331..5a8678be2b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -24,6 +24,9 @@ endif() include(FindPythonInterp) if(PYTHONINTERP_FOUND) + set(LIT_ARGS "${LLVM_LIT_ARGS}") + separate_arguments(LIT_ARGS) + get_directory_property(DEFINITIONS COMPILE_DEFINITIONS) foreach(DEF ${DEFINITIONS}) set(DEFS "${DEFS} -D${DEF}") @@ -78,7 +81,7 @@ if(PYTHONINTERP_FOUND) ${LLVM_SOURCE_DIR}/utils/lit/lit.py --param llvm_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg --param llvm_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg - -sv + ${LIT_ARGS} ${CMAKE_CURRENT_BINARY_DIR} DEPENDS COMMENT "Running LLVM regression tests") |