Switch to using 'lit.site.cfg.in' for the site config template for Unit tests,

and generate it for CMake builds as well.

llvm-svn: 86451

2 files changed, 11 insertions, 2 deletions

diff --git a/llvm/test/Unit/lit.cfg b/llvm/test/Unit/lit.cfg
index 6fd39988aea..8321593cf71 100644
--- a/llvm/test/Unit/lit.cfg
+++ b/llvm/test/Unit/lit.cfg
@@ -7,8 +7,7 @@ import os
 # name: The name of this test suite.
 config.name = 'LLVM-Unit'
 
-# suffixes: A list of file extensions to treat as test files, this is actually
-# set by on_clone().
+# suffixes: A list of file extensions to treat as test files.
 config.suffixes = []
 
 # test_source_root: The root path where tests are located.
diff --git a/llvm/test/Unit/lit.site.cfg.in b/llvm/test/Unit/lit.site.cfg.in
new file mode 100644
index 00000000000..c190ffa68e5
--- /dev/null
+++ b/llvm/test/Unit/lit.site.cfg.in
@@ -0,0 +1,10 @@
+## Autogenerated by LLVM/Clang configuration.
+# Do not edit!
+config.llvm_src_root = "@LLVM_SOURCE_DIR@"
+config.llvm_obj_root = "@LLVM_BINARY_DIR@"
+config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
+config.llvmgcc_dir = "@LLVMGCCDIR@"
+config.llvm_build_mode = "@LLVM_BUILD_MODE@"
+
+# Let the main config do the real work.
+lit.load_config(config, "@LLVM_SOURCE_DIR@/test/Unit/lit.cfg")