[test-suite] r251483 - Produce a lit.site.cfg in the build directory

Matthias Braun via llvm-commits llvm-commits at lists.llvm.org
Tue Oct 27 19:42:55 PDT 2015


Author: matze
Date: Tue Oct 27 21:42:54 2015
New Revision: 251483

URL: http://llvm.org/viewvc/llvm-project?rev=251483&view=rev
Log:
Produce a lit.site.cfg in the build directory

This way the build directory does not need to be a subdirectory of the
sourcedir.

Added:
    test-suite/trunk/lit.site.cfg.in
Modified:
    test-suite/trunk/CMakeLists.txt
    test-suite/trunk/lit.cfg

Modified: test-suite/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/CMakeLists.txt?rev=251483&r1=251482&r2=251483&view=diff
==============================================================================
--- test-suite/trunk/CMakeLists.txt (original)
+++ test-suite/trunk/CMakeLists.txt Tue Oct 27 21:42:54 2015
@@ -63,3 +63,6 @@ set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_BI
 
 add_subdirectory(SingleSource)
 add_subdirectory(MultiSource)
+
+# Produce lit.site.cfg
+configure_file("${CMAKE_SOURCE_DIR}/lit.site.cfg.in" "${CMAKE_BINARY_DIR}/lit.site.cfg")

Modified: test-suite/trunk/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/lit.cfg?rev=251483&r1=251482&r2=251483&view=diff
==============================================================================
--- test-suite/trunk/lit.cfg (original)
+++ test-suite/trunk/lit.cfg Tue Oct 27 21:42:54 2015
@@ -42,5 +42,4 @@ config.name = 'test-suite'
 
 config.test_format = TestSuiteTest()
 config.suffixes = ['.test']
-config.test_source_root = os.path.dirname(__file__)
 config.excludes = ['ABI-Testsuite']

Added: test-suite/trunk/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/lit.site.cfg.in?rev=251483&view=auto
==============================================================================
--- test-suite/trunk/lit.site.cfg.in (added)
+++ test-suite/trunk/lit.site.cfg.in Tue Oct 27 21:42:54 2015
@@ -0,0 +1,6 @@
+import sys
+
+config.test_source_root = "@CMAKE_BINARY_DIR@"
+config.test_suite_root = "@CMAKE_SOURCE_DIR@"
+
+lit_config.load_config(config, "@CMAKE_SOURCE_DIR@/lit.cfg")




More information about the llvm-commits mailing list