[llvm-commits] [lld] r172339 - in /lld/trunk/test: CMakeLists.txt lit.cfg lit.site.cfg.in

[Michael J. Spencer]

Author: mspencer
Date: Sat Jan 12 19:09:51 2013
New Revision: 172339

URL: http://llvm.org/viewvc/llvm-project?rev=172339&view=rev
Log:
[test] Fix tests on Windows.

Modified:
    lld/trunk/test/CMakeLists.txt
    lld/trunk/test/lit.cfg
    lld/trunk/test/lit.site.cfg.in

Modified: lld/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/CMakeLists.txt?rev=172339&r1=172338&r2=172339&view=diff
==============================================================================
--- lld/trunk/test/CMakeLists.txt (original)
+++ lld/trunk/test/CMakeLists.txt Sat Jan 12 19:09:51 2013
@@ -11,7 +11,7 @@
   set(ENABLE_SHARED 0)
 endif(BUILD_SHARED_LIBS)
 
-configure_file(
+configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)
 

Modified: lld/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/lit.cfg?rev=172339&r1=172338&r2=172339&view=diff
==============================================================================
--- lld/trunk/test/lit.cfg (original)
+++ lld/trunk/test/lit.cfg Sat Jan 12 19:09:51 2013
@@ -51,6 +51,12 @@
                                  config.environment.get('LD_LIBRARY_PATH','')))
     config.environment['LD_LIBRARY_PATH'] = path
 
+    # Propagate LLVM_SRC_ROOT into the environment.
+    config.environment['LLVM_SRC_ROOT'] = getattr(config, 'llvm_src_root', '')
+
+    # Propagate PYTHON_EXECUTABLE into the environment
+    config.environment['PYTHON_EXECUTABLE'] = getattr(config, 'python_executable',
+                                                      '')
 ###
 
 # Check that the object root is known.

Modified: lld/trunk/test/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/lit.site.cfg.in?rev=172339&r1=172338&r2=172339&view=diff
==============================================================================
--- lld/trunk/test/lit.site.cfg.in (original)
+++ lld/trunk/test/lit.site.cfg.in Sat Jan 12 19:09:51 2013
@@ -7,6 +7,7 @@
 config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
 config.lld_obj_root = "@LLD_BINARY_DIR@"
 config.target_triple = "@TARGET_TRIPLE@"
+config.python_executable = "@PYTHON_EXECUTABLE@"
 
 # Support substitution of the tools and libs dirs with user parameters. This is
 # used when we can't determine the tool dir at configuration time.