Add .py extension to clang-tools-extra lit cfg files
authorNico Weber <nicolasweber@gmx.de>
Fri, 29 Mar 2019 02:46:31 +0000 (02:46 +0000)
committerNico Weber <nicolasweber@gmx.de>
Fri, 29 Mar 2019 02:46:31 +0000 (02:46 +0000)
Follow-up to r313892, which did this for clang and llvm.

Differential Revision: https://reviews.llvm.org/D59953

llvm-svn: 357231

clang-tools-extra/test/CMakeLists.txt
clang-tools-extra/test/Unit/lit.cfg.py [moved from clang-tools-extra/test/Unit/lit.cfg with 100% similarity]
clang-tools-extra/test/Unit/lit.site.cfg.py.in [moved from clang-tools-extra/test/Unit/lit.site.cfg.in with 95% similarity]
clang-tools-extra/test/lit.cfg.py [moved from clang-tools-extra/test/lit.cfg with 100% similarity]
clang-tools-extra/test/lit.site.cfg.py.in [moved from clang-tools-extra/test/lit.site.cfg.in with 99% similarity]

index d28502e..dc6d28e 100644 (file)
@@ -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)
similarity index 95%
rename from clang-tools-extra/test/Unit/lit.site.cfg.in
rename to clang-tools-extra/test/Unit/lit.site.cfg.py.in
index 69a5cd5..dc7ee33 100644 (file)
@@ -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")
similarity index 99%
rename from clang-tools-extra/test/lit.site.cfg.in
rename to clang-tools-extra/test/lit.site.cfg.py.in
index d71ca18..bfa283d 100644 (file)
@@ -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")