[llvm-commits] [llvm] r90869 - in /llvm/trunk/test: CMakeLists.txt Unit/lit.cfg lit.cfg

[Daniel Dunbar]

Author: ddunbar
Date: Tue Dec  8 13:47:36 2009
New Revision: 90869

URL: http://llvm.org/viewvc/llvm-project?rev=90869&view=rev
Log:
CMake/lit: Add llvm_{unit_,}site_config parameters, and always pass them when running tests from the project files.

Modified:
    llvm/trunk/test/CMakeLists.txt
    llvm/trunk/test/Unit/lit.cfg
    llvm/trunk/test/lit.cfg

Modified: llvm/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CMakeLists.txt?rev=90869&r1=90868&r2=90869&view=diff

==============================================================================
--- llvm/trunk/test/CMakeLists.txt (original)
+++ llvm/trunk/test/CMakeLists.txt Tue Dec  8 13:47:36 2009
@@ -31,6 +31,8 @@
                 ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
     COMMAND ${PYTHON_EXECUTABLE}
                 ${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
                 ${CMAKE_CURRENT_BINARY_DIR}
                 DEPENDS

Modified: llvm/trunk/test/Unit/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Unit/lit.cfg?rev=90869&r1=90868&r2=90869&view=diff

==============================================================================
--- llvm/trunk/test/Unit/lit.cfg (original)
+++ llvm/trunk/test/Unit/lit.cfg Tue Dec  8 13:47:36 2009
@@ -32,6 +32,12 @@
     # configuration hasn't been created by the build system, or we are in an
     # out-of-tree build situation).
 
+    # Check for 'llvm_unit_site_config' user parameter, and use that if available.
+    site_cfg = lit.params.get('llvm_unit_site_config', None)
+    if site_cfg and os.path.exists(site_cfg):
+        lit.load_config(config, site_cfg)
+        raise SystemExit
+
     # Try to detect the situation where we are using an out-of-tree build by
     # looking for 'llvm-config'.
     #

Modified: llvm/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lit.cfg?rev=90869&r1=90868&r2=90869&view=diff

==============================================================================
--- llvm/trunk/test/lit.cfg (original)
+++ llvm/trunk/test/lit.cfg Tue Dec  8 13:47:36 2009
@@ -58,6 +58,12 @@
     # configuration hasn't been created by the build system, or we are in an
     # out-of-tree build situation).
 
+    # Check for 'llvm_site_config' user parameter, and use that if available.
+    site_cfg = lit.params.get('llvm_site_config', None)
+    if site_cfg and os.path.exists(site_cfg):
+        lit.load_config(config, site_cfg)
+        raise SystemExit
+
     # Try to detect the situation where we are using an out-of-tree build by
     # looking for 'llvm-config'.
     #