summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang-tools-extra/test/CMakeLists.txt12
-rw-r--r--clang-tools-extra/test/Unit/lit.cfg.py (renamed from clang-tools-extra/test/Unit/lit.cfg)0
-rw-r--r--clang-tools-extra/test/Unit/lit.site.cfg.py.in (renamed from clang-tools-extra/test/Unit/lit.site.cfg.in)2
-rw-r--r--clang-tools-extra/test/lit.cfg.py (renamed from clang-tools-extra/test/lit.cfg)0
-rw-r--r--clang-tools-extra/test/lit.site.cfg.py.in (renamed from clang-tools-extra/test/lit.site.cfg.in)2
5 files changed, 10 insertions, 6 deletions
diff --git a/clang-tools-extra/test/CMakeLists.txt b/clang-tools-extra/test/CMakeLists.txt
index d28502ed12b..dc6d28efc1c 100644
--- a/clang-tools-extra/test/CMakeLists.txt
+++ b/clang-tools-extra/test/CMakeLists.txt
@@ -20,13 +20,17 @@ llvm_canonicalize_cmake_booleans(
CLANGD_BUILD_XPC_SUPPORT)
configure_lit_site_cfg(
- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
- ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
+ ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
+ ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
+ MAIN_CONFIG
+ ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py
)
configure_lit_site_cfg(
- ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in
- ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
+ ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in
+ ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py
+ MAIN_CONFIG
+ ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.cfg.py
)
option(CLANG_TOOLS_TEST_USE_VG "Run Clang tools' tests under Valgrind" OFF)
diff --git a/clang-tools-extra/test/Unit/lit.cfg b/clang-tools-extra/test/Unit/lit.cfg.py
index b40e1cae29e..b40e1cae29e 100644
--- a/clang-tools-extra/test/Unit/lit.cfg
+++ b/clang-tools-extra/test/Unit/lit.cfg.py
diff --git a/clang-tools-extra/test/Unit/lit.site.cfg.in b/clang-tools-extra/test/Unit/lit.site.cfg.py.in
index 69a5cd5d194..dc7ee330d13 100644
--- a/clang-tools-extra/test/Unit/lit.site.cfg.in
+++ b/clang-tools-extra/test/Unit/lit.site.cfg.py.in
@@ -6,4 +6,4 @@ config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
config.shlibdir = "@SHLIBDIR@"
config.target_triple = "@TARGET_TRIPLE@"
-lit_config.load_config(config, "@CLANG_TOOLS_SOURCE_DIR@/test/Unit/lit.cfg")
+lit_config.load_config(config, "@CLANG_TOOLS_SOURCE_DIR@/test/Unit/lit.cfg.py")
diff --git a/clang-tools-extra/test/lit.cfg b/clang-tools-extra/test/lit.cfg.py
index ed7bb83c9dd..ed7bb83c9dd 100644
--- a/clang-tools-extra/test/lit.cfg
+++ b/clang-tools-extra/test/lit.cfg.py
diff --git a/clang-tools-extra/test/lit.site.cfg.in b/clang-tools-extra/test/lit.site.cfg.py.in
index d71ca188a67..bfa283dba9d 100644
--- a/clang-tools-extra/test/lit.site.cfg.in
+++ b/clang-tools-extra/test/lit.site.cfg.py.in
@@ -28,4 +28,4 @@ import lit.llvm
lit.llvm.initialize(lit_config, config)
# Let the main config do the real work.
-lit_config.load_config(config, "@CLANG_TOOLS_SOURCE_DIR@/test/lit.cfg")
+lit_config.load_config(config, "@CLANG_TOOLS_SOURCE_DIR@/test/lit.cfg.py")
OpenPOWER on IntegriCloud