From ef7b84231e243f2201a32f274cdd588a3e43e158 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Fri, 29 Mar 2019 02:46:31 +0000 Subject: [PATCH] Add .py extension to clang-tools-extra lit cfg files 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 | 12 ++++++++---- clang-tools-extra/test/Unit/{lit.cfg => lit.cfg.py} | 0 .../test/Unit/{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- clang-tools-extra/test/{lit.cfg => lit.cfg.py} | 0 .../test/{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) rename clang-tools-extra/test/Unit/{lit.cfg => lit.cfg.py} (100%) rename clang-tools-extra/test/Unit/{lit.site.cfg.in => lit.site.cfg.py.in} (95%) rename clang-tools-extra/test/{lit.cfg => lit.cfg.py} (100%) rename clang-tools-extra/test/{lit.site.cfg.in => lit.site.cfg.py.in} (99%) diff --git a/clang-tools-extra/test/CMakeLists.txt b/clang-tools-extra/test/CMakeLists.txt index d28502e..dc6d28e 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 similarity index 100% rename from clang-tools-extra/test/Unit/lit.cfg rename to 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 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 --- 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 similarity index 100% rename from clang-tools-extra/test/lit.cfg rename to 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 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 --- 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") -- 2.7.4