CMake: Add the new option "LLVM_LIT_ARGS".

Defaults:
if (MSVC OR XCODE): "-sv --no-progress-bar"
else: "-sv"

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@118776 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
NAKAMURA Takumi 2010-11-11 04:09:35 +00:00
parent 3f2d13c98e
commit e7ae70b137
3 changed files with 18 additions and 1 deletions

View File

@ -89,6 +89,13 @@ set(C_INCLUDE_DIRS "" CACHE STRING
set(LLVM_TARGET_ARCH "host" set(LLVM_TARGET_ARCH "host"
CACHE STRING "Set target to use for LLVM JIT or use \"host\" for automatic detection.") 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) option(LLVM_ENABLE_THREADS "Use threads if available." ON)
if( uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE" ) if( uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE" )

View File

@ -325,6 +325,13 @@
<dd>Full path to a native TableGen executable (usually <dd>Full path to a native TableGen executable (usually
named <i>tblgen</i>). This is intented for cross-compiling: if the named <i>tblgen</i>). This is intented for cross-compiling: if the
user sets this variable, no native TableGen will be created.</dd> 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>&quot;-sv --no-progress-bar&quot;</tt>
on Visual C++ and Xcode,
<tt>&quot;-sv&quot;</tt> on others.</dd>
</dl> </dl>
</div> </div>

View File

@ -24,6 +24,9 @@ endif()
include(FindPythonInterp) include(FindPythonInterp)
if(PYTHONINTERP_FOUND) if(PYTHONINTERP_FOUND)
set(LIT_ARGS "${LLVM_LIT_ARGS}")
separate_arguments(LIT_ARGS)
get_directory_property(DEFINITIONS COMPILE_DEFINITIONS) get_directory_property(DEFINITIONS COMPILE_DEFINITIONS)
foreach(DEF ${DEFINITIONS}) foreach(DEF ${DEFINITIONS})
set(DEFS "${DEFS} -D${DEF}") set(DEFS "${DEFS} -D${DEF}")
@ -78,7 +81,7 @@ if(PYTHONINTERP_FOUND)
${LLVM_SOURCE_DIR}/utils/lit/lit.py ${LLVM_SOURCE_DIR}/utils/lit/lit.py
--param llvm_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg --param llvm_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
--param llvm_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg --param llvm_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
-sv ${LIT_ARGS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS DEPENDS
COMMENT "Running LLVM regression tests") COMMENT "Running LLVM regression tests")