[llvm-commits] [llvm] r118776 - in /llvm/trunk: CMakeLists.txt docs/CMake.html test/CMakeLists.txt

[NAKAMURA Takumi]

Author: chapuni
Date: Wed Nov 10 22:09:35 2010
New Revision: 118776

URL: http://llvm.org/viewvc/llvm-project?rev=118776&view=rev
Log:
CMake: Add the new option "LLVM_LIT_ARGS".

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

Modified:
    llvm/trunk/CMakeLists.txt
    llvm/trunk/docs/CMake.html
    llvm/trunk/test/CMakeLists.txt

Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=118776&r1=118775&r2=118776&view=diff
==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Wed Nov 10 22:09:35 2010
@@ -89,6 +89,13 @@
 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" )

Modified: llvm/trunk/docs/CMake.html
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CMake.html?rev=118776&r1=118775&r2=118776&view=diff
==============================================================================
--- llvm/trunk/docs/CMake.html (original)
+++ llvm/trunk/docs/CMake.html Wed Nov 10 22:09:35 2010
@@ -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>

Modified: llvm/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CMakeLists.txt?rev=118776&r1=118775&r2=118776&view=diff
==============================================================================
--- llvm/trunk/test/CMakeLists.txt (original)
+++ llvm/trunk/test/CMakeLists.txt Wed Nov 10 22:09:35 2010
@@ -24,6 +24,9 @@
 
 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 @@
                 ${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")