Include LLVM {src,obj} root in lit.site.cfg, to support non-standard layouts.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@82401 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1c9567f8bd61acf176e93c11577126f98a0d02a7..cb2b80a16099a7db374468505821939b7202cbc8 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -32,9 +32,11 @@ if(PYTHONINTERP_FOUND)
 
   foreach(testdir ${CLANG_TEST_DIRECTORIES})
     add_custom_target(clang-test-${testdir} 
-      COMMAND sed -e "s#\@CLANG_SOURCE_DIR\@#${CMAKE_CURRENT_SOURCE_DIR}/..#"
-                  -e "s#\@CLANG_BINARY_DIR\@#${CMAKE_CURRENT_BINARY_DIR}/..#"
+      COMMAND sed -e "s#\@LLVM_SOURCE_DIR\@#${LLVM_MAIN_SRC_DIR}#"
+                  -e "s#\@LLVM_BINARY_DIR\@#${LLVM_BINARY_DIR}#"
                   -e "s#\@LLVM_TOOLS_DIR\@#${LLVM_TOOLS_PATH}/${CMAKE_CFG_INTDIR}#"
+                  -e "s#\@CLANG_SOURCE_DIR\@#${CMAKE_CURRENT_SOURCE_DIR}/..#"
+                  -e "s#\@CLANG_BINARY_DIR\@#${CMAKE_CURRENT_BINARY_DIR}/..#"
                   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in >
                   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
       COMMAND ${PYTHON_EXECUTABLE} 
@@ -46,9 +48,11 @@ if(PYTHONINTERP_FOUND)
   endforeach()
 
   add_custom_target(clang-test
-    COMMAND sed -e "s#\@CLANG_SOURCE_DIR\@#${CMAKE_CURRENT_SOURCE_DIR}/..#"
-                -e "s#\@CLANG_BINARY_DIR\@#${CMAKE_CURRENT_BINARY_DIR}/..#"
+    COMMAND sed -e "s#\@LLVM_SOURCE_DIR\@#${LLVM_MAIN_SRC_DIR}#"
+                -e "s#\@LLVM_BINARY_DIR\@#${LLVM_BINARY_DIR}#"
                 -e "s#\@LLVM_TOOLS_DIR\@#${LLVM_TOOLS_PATH}/${CMAKE_CFG_INTDIR}#"
+                -e "s#\@CLANG_SOURCE_DIR\@#${CMAKE_CURRENT_SOURCE_DIR}/..#"
+                -e "s#\@CLANG_BINARY_DIR\@#${CMAKE_CURRENT_BINARY_DIR}/..#"
                 ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in >
                 ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
     COMMAND ${PYTHON_EXECUTABLE} 

diff --git a/test/Makefile b/test/Makefile
index 223fd8380b9fc8ca0311b7ebd8f629add16e8d0b..88cc955f38a3c269fdc47234a2f85f8b800bf15d 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -43,10 +43,12 @@ endif
 FORCE:
 
 lit.site.cfg: FORCE
-       @echo "Making 'lit.site.cfg' file..."
-       @sed -e "s#@CLANG_SOURCE_DIR@#$(PROJ_SRC_DIR)/..#g" \
-            -e "s#@CLANG_BINARY_DIR@#$(PROJ_OBJ_DIR)/..#g" \
+       @echo "Making Clang 'lit.site.cfg' file..."
+       @sed -e "s#@LLVM_SOURCE_DIR@#$(LLVM_SRC_ROOT)#g" \
+            -e "s#@LLVM_BINARY_DIR@#$(LLVM_OBJ_ROOT)#g" \
             -e "s#@LLVM_TOOLS_DIR@#$(ToolDir)#g" \
+            -e "s#@CLANG_SOURCE_DIR@#$(PROJ_SRC_DIR)/..#g" \
+            -e "s#@CLANG_BINARY_DIR@#$(PROJ_OBJ_DIR)/..#g" \
             $(PROJ_SRC_DIR)/lit.site.cfg.in > $@
 
 clean::

diff --git a/test/lit.cfg b/test/lit.cfg
index bca4d5190a8b8f33071bd857bfc1f093a1961fb2..0a99aa4ee9dd3e5e3165db6cd6b1ecbad7018410 100644 (file)
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -27,11 +27,8 @@ def config_new():
         config.test_exec_root = os.path.join(clang_obj_root, 'test')
 
     # Set llvm_{src,obj}_root for use by others.
-    config.llvm_src_root = os.path.join(config.test_source_root,
-                                        '..', '..', '..')
-    if clang_obj_root is not None:
-        config.llvm_obj_root = os.path.join(clang_obj_root,
-                                            '..', '..')
+    config.llvm_src_root = getattr(config, 'llvm_src_root', None)
+    config.llvm_obj_root = getattr(config, 'llvm_obj_root', None)
 
     # Tweak the PATH to include the tools dir and the scripts dir.
     if clang_obj_root is not None:

diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
index e91fbed5905376de4b7bc182ee44d64bdd702ed7..eab8793517c25aa37efa9d600e52ec740c929479 100644 (file)
--- a/test/lit.site.cfg.in
+++ b/test/lit.site.cfg.in
@@ -1,7 +1,9 @@
 ## Autogenerated by LLVM/Clang configuration.
 # Do not edit!
-config.clang_obj_root = "@CLANG_BINARY_DIR@"
+config.llvm_src_root = "@LLVM_SOURCE_DIR@"
+config.llvm_obj_root = "@LLVM_BINARY_DIR@"
 config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
+config.clang_obj_root = "@CLANG_BINARY_DIR@"
 
 # Let the main config do the real work.
 lit.load_config(config, "@CLANG_SOURCE_DIR@/test/lit.cfg")