Add target_triple to Clang site configuration.

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

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 66f05bff69945281d20c01e413ec3b445d8eb98b..a83a1993c8f043d29d4e0a2931562b8fcb084f13 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -24,6 +24,7 @@ set(CLANG_TEST_DIRECTORIES
 
 include(FindPythonInterp)
 if(PYTHONINTERP_FOUND)
+  get_target_triple(TARGET_TRIPLE)
   get_target_property(LLVM_TOOLS_PATH clang RUNTIME_OUTPUT_DIRECTORY)
   get_target_property(LLVM_LIBS_PATH clang LIBRARY_OUTPUT_DIRECTORY)
   set(CLANG_TEST_EXTRA_ARGS)
@@ -32,16 +33,17 @@ if(PYTHONINTERP_FOUND)
   endif()
 
   foreach(testdir ${CLANG_TEST_DIRECTORIES})
-    add_custom_target(clang-test-${testdir} 
+    add_custom_target(clang-test-${testdir}
       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#\@LLVM_LIBS_DIR\@#${LLVM_LIBS_PATH}/${CMAKE_CFG_INTDIR}#"
                   -e "s#\@CLANG_SOURCE_DIR\@#${CMAKE_CURRENT_SOURCE_DIR}/..#"
                   -e "s#\@CLANG_BINARY_DIR\@#${CMAKE_CURRENT_BINARY_DIR}/..#"
+                  -e "s#\@TARGET_TRIPLE\@#${TARGET_TRIPLE}#"
                   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in >
                   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
-      COMMAND ${PYTHON_EXECUTABLE} 
+      COMMAND ${PYTHON_EXECUTABLE}
                   ${LLVM_SOURCE_DIR}/utils/lit/lit.py
                   -sv ${CLANG_TEST_EXTRA_ARGS}
                   ${CMAKE_CURRENT_BINARY_DIR}/${testdir}
@@ -56,9 +58,10 @@ if(PYTHONINTERP_FOUND)
                 -e "s#\@LLVM_LIBS_DIR\@#${LLVM_LIBS_PATH}/${CMAKE_CFG_INTDIR}#"
                 -e "s#\@CLANG_SOURCE_DIR\@#${CMAKE_CURRENT_SOURCE_DIR}/..#"
                 -e "s#\@CLANG_BINARY_DIR\@#${CMAKE_CURRENT_BINARY_DIR}/..#"
+                -e "s#\@TARGET_TRIPLE\@#${TARGET_TRIPLE}#"
                 ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in >
                 ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
-    COMMAND ${PYTHON_EXECUTABLE} 
+    COMMAND ${PYTHON_EXECUTABLE}
                 ${LLVM_SOURCE_DIR}/utils/lit/lit.py
                 -sv ${CLANG_TEST_EXTRA_ARGS}
                 ${CMAKE_CURRENT_BINARY_DIR}
@@ -72,12 +75,13 @@ if(PYTHONINTERP_FOUND)
                 -e "s#\@LLVM_LIBS_DIR\@#${LLVM_LIBS_PATH}/${CMAKE_CFG_INTDIR}#"
                 -e "s#\@CLANG_SOURCE_DIR\@#${CMAKE_CURRENT_SOURCE_DIR}/..#"
                 -e "s#\@CLANG_BINARY_DIR\@#${CMAKE_CURRENT_BINARY_DIR}/..#"
+                -e "s#\@TARGET_TRIPLE\@#${TARGET_TRIPLE}#"
                 ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in >
                 ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
-    COMMAND ${PYTHON_EXECUTABLE} 
+    COMMAND ${PYTHON_EXECUTABLE}
                 ${LLVM_SOURCE_DIR}/utils/lit/lit.py
                 -sv ${CLANG_TEST_EXTRA_ARGS}
                 ${CMAKE_CURRENT_SOURCE_DIR}/../utils/C++Tests
                 DEPENDS clang clang-cc index-test c-index-test
                 COMMENT "Running Clang regression tests")
-endif()  
+endif()

diff --git a/test/Makefile b/test/Makefile
index 8543d431442ba3fc2cc703bb229722775c3341a8..57291429f95860571cc9e12e34c87bfe438fdd79 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -40,6 +40,7 @@ lit.site.cfg: FORCE
             -e "s#@LLVM_LIBS_DIR@#$(LibDir)#g" \
             -e "s#@CLANG_SOURCE_DIR@#$(PROJ_SRC_DIR)/..#g" \
             -e "s#@CLANG_BINARY_DIR@#$(PROJ_OBJ_DIR)/..#g" \
+            -e "s#@TARGET_TRIPLE@#$(TARGET_TRIPLE)#g" \
             $(PROJ_SRC_DIR)/lit.site.cfg.in > $@
 
 clean::

diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
index 9dabafcde1f424e0ba70d6498f17932b3b4860fd..c88c90b7c5dff942624f5e464ea276cc21f744f5 100644 (file)
--- a/test/lit.site.cfg.in
+++ b/test/lit.site.cfg.in
@@ -5,6 +5,7 @@ config.llvm_obj_root = "@LLVM_BINARY_DIR@"
 config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
 config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
 config.clang_obj_root = "@CLANG_BINARY_DIR@"
+config.target_triple = "@TARGET_TRIPLE@"
 
 # Let the main config do the real work.
 lit.load_config(config, "@CLANG_SOURCE_DIR@/test/lit.cfg")