Reverting because reverting r200145.

Revert "clang-check: Unittests doesn't requires tools."

This reverts commit r200147.

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

diff --git a/test/Makefile b/test/Makefile
index 55250a79c4eea1e7d168ab6d3c0a35579778d33b..a7f698f65935d2c999fca21b66edac2e22fc77e6 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -55,6 +55,7 @@ lit.site.cfg: FORCE
 Unit/lit.site.cfg: FORCE
        @echo "Making Clang 'Unit/lit.site.cfg' file..."
        @$(MKDIR) $(dir $@)
+       @$(ECHOPATH) s=@LLVM_TOOLS_DIR@=$(ToolDir)=g >> unit.tmp
        @$(ECHOPATH) s=@LLVM_LIBS_DIR@=$(LibDir)=g >> unit.tmp
        @$(ECHOPATH) s=@CLANG_SOURCE_DIR@=$(PROJ_SRC_DIR)/..=g >> unit.tmp
        @$(ECHOPATH) s=@CLANG_BINARY_DIR@=$(PROJ_OBJ_DIR)/..=g >> unit.tmp

diff --git a/test/Unit/lit.site.cfg.in b/test/Unit/lit.site.cfg.in
index cfa0cc69937dae590cc9ae791a9ad28302b166f6..3df60696b68bdb5b254a3fa2fe3a4cbeecbbc6fd 100644 (file)
--- a/test/Unit/lit.site.cfg.in
+++ b/test/Unit/lit.site.cfg.in
@@ -2,6 +2,7 @@ import sys
 
 ## Autogenerated by LLVM/Clang configuration.
 # Do not edit!
+config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
 config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
 config.llvm_build_mode = "@LLVM_BUILD_MODE@"
 config.clang_obj_root = "@CLANG_BINARY_DIR@"
@@ -14,6 +15,7 @@ config.target_triple = "@TARGET_TRIPLE@"
 # parameters. This is used when we can't determine the tool dir at
 # configuration time.
 try:
+    config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
     config.llvm_libs_dir = config.llvm_libs_dir % lit_config.params
     config.llvm_build_mode = config.llvm_build_mode % lit_config.params
 except KeyError: