From 8007ff1ab159ae56cb32184626119b7087c59d06 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Thu, 27 Jun 2019 20:56:04 +0000 Subject: [PATCH] [compiler-rt] Rename lit.*.cfg.* -> lit.*.cfg.py.* These lit configuration files are really Python source code. Using the .py file extension helps editors and tools use the correct language mode. LLVM and Clang already use this convention for lit configuration, this change simply applies it to all of compiler-rt. Reviewers: vitalybuka, dberris Differential Revision: https://reviews.llvm.org/D63658 llvm-svn: 364591 --- compiler-rt/test/asan/CMakeLists.txt | 24 +++++++++---------- .../{lit.local.cfg => lit.local.cfg.py} | 0 .../{lit.local.cfg => lit.local.cfg.py} | 0 .../{lit.local.cfg => lit.local.cfg.py} | 0 .../Linux/{lit.local.cfg => lit.local.cfg.py} | 0 .../Posix/{lit.local.cfg => lit.local.cfg.py} | 0 .../{lit.local.cfg => lit.local.cfg.py} | 0 .../{lit.site.cfg.in => lit.site.cfg.py.in} | 0 compiler-rt/test/asan/{lit.cfg => lit.cfg.py} | 2 +- .../{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- compiler-rt/test/builtins/CMakeLists.txt | 8 +++---- .../{lit.local.cfg => lit.local.cfg.py} | 0 .../builtins/Unit/{lit.cfg => lit.cfg.py} | 2 +- .../{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- .../test/builtins/{lit.cfg => lit.cfg.py} | 0 .../{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- compiler-rt/test/cfi/CMakeLists.txt | 8 +++---- .../icall/{lit.local.cfg => lit.local.cfg.py} | 0 .../{lit.local.cfg => lit.local.cfg.py} | 0 .../icall/{lit.local.cfg => lit.local.cfg.py} | 0 compiler-rt/test/cfi/{lit.cfg => lit.cfg.py} | 0 .../{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- compiler-rt/test/crt/CMakeLists.txt | 4 ++-- compiler-rt/test/crt/{lit.cfg => lit.cfg.py} | 0 .../{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- compiler-rt/test/dfsan/CMakeLists.txt | 4 ++-- .../test/dfsan/{lit.cfg => lit.cfg.py} | 0 .../{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- compiler-rt/test/fuzzer/CMakeLists.txt | 12 +++++----- .../test/fuzzer/{lit.cfg => lit.cfg.py} | 0 .../{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- .../{lit.site.cfg.in => lit.site.cfg.py.in} | 0 compiler-rt/test/gwp_asan/CMakeLists.txt | 12 +++++----- .../test/gwp_asan/{lit.cfg => lit.cfg.py} | 0 .../{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- .../{lit.site.cfg.in => lit.site.cfg.py.in} | 0 compiler-rt/test/hwasan/CMakeLists.txt | 4 ++-- .../Linux/{lit.local.cfg => lit.local.cfg.py} | 0 .../Posix/{lit.local.cfg => lit.local.cfg.py} | 0 .../test/hwasan/{lit.cfg => lit.cfg.py} | 0 .../{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- compiler-rt/test/interception/CMakeLists.txt | 4 ++-- .../{lit.site.cfg.in => lit.site.cfg.py.in} | 0 .../{lit.common.cfg => lit.common.cfg.py} | 2 +- compiler-rt/test/lit.common.configured.in | 2 +- compiler-rt/test/lsan/CMakeLists.txt | 8 +++---- .../{lit.local.cfg => lit.local.cfg.py} | 0 .../Linux/{lit.local.cfg => lit.local.cfg.py} | 0 .../Posix/{lit.local.cfg => lit.local.cfg.py} | 0 .../{lit.common.cfg => lit.common.cfg.py} | 2 +- .../{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- compiler-rt/test/msan/CMakeLists.txt | 8 +++---- .../Linux/{lit.local.cfg => lit.local.cfg.py} | 0 .../{lit.site.cfg.in => lit.site.cfg.py.in} | 0 compiler-rt/test/msan/{lit.cfg => lit.cfg.py} | 0 .../{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- compiler-rt/test/profile/CMakeLists.txt | 4 ++-- .../Linux/{lit.local.cfg => lit.local.cfg.py} | 0 .../Posix/{lit.local.cfg => lit.local.cfg.py} | 0 .../test/profile/{lit.cfg => lit.cfg.py} | 2 +- .../{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- compiler-rt/test/safestack/CMakeLists.txt | 4 ++-- .../test/safestack/{lit.cfg => lit.cfg.py} | 0 .../{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- .../test/sanitizer_common/CMakeLists.txt | 8 +++---- .../{lit.local.cfg => lit.local.cfg.py} | 0 .../{lit.local.cfg => lit.local.cfg.py} | 0 .../Linux/{lit.local.cfg => lit.local.cfg.py} | 0 .../{lit.local.cfg => lit.local.cfg.py} | 0 .../Posix/{lit.local.cfg => lit.local.cfg.py} | 0 .../{lit.site.cfg.in => lit.site.cfg.py.in} | 0 .../{lit.common.cfg => lit.common.cfg.py} | 0 .../{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- compiler-rt/test/scudo/CMakeLists.txt | 8 +++---- .../test/scudo/{lit.cfg => lit.cfg.py} | 0 .../{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- .../test/scudo/standalone/CMakeLists.txt | 4 ++-- .../{lit.site.cfg.in => lit.site.cfg.py.in} | 0 .../test/shadowcallstack/CMakeLists.txt | 4 ++-- .../shadowcallstack/{lit.cfg => lit.cfg.py} | 0 .../{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- compiler-rt/test/tsan/CMakeLists.txt | 16 ++++++------- .../{lit.local.cfg => lit.local.cfg.py} | 0 .../Linux/{lit.local.cfg => lit.local.cfg.py} | 0 .../{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- .../{lit.local.cfg => lit.local.cfg.py} | 0 .../{lit.local.cfg => lit.local.cfg.py} | 0 compiler-rt/test/tsan/{lit.cfg => lit.cfg.py} | 4 ++-- .../{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- compiler-rt/test/ubsan/CMakeLists.txt | 8 +++---- .../Linux/{lit.local.cfg => lit.local.cfg.py} | 0 .../{lit.local.cfg => lit.local.cfg.py} | 0 .../Linux/{lit.local.cfg => lit.local.cfg.py} | 0 .../{lit.common.cfg => lit.common.cfg.py} | 2 +- .../{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- compiler-rt/test/ubsan_minimal/CMakeLists.txt | 4 ++-- .../{lit.common.cfg => lit.common.cfg.py} | 2 +- .../{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- compiler-rt/test/xray/CMakeLists.txt | 8 +++---- .../{lit.site.cfg.in => lit.site.cfg.py.in} | 0 compiler-rt/test/xray/{lit.cfg => lit.cfg.py} | 0 .../{lit.site.cfg.in => lit.site.cfg.py.in} | 2 +- ...common.unit.cfg => lit.common.unit.cfg.py} | 0 .../unittests/lit.common.unit.configured.in | 2 +- .../unittests/lit_unittest_cfg_utils.py | 2 +- .../compiler-rt/test/hwasan/BUILD.gn | 4 ++-- 106 files changed, 117 insertions(+), 117 deletions(-) rename compiler-rt/test/asan/TestCases/Android/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/asan/TestCases/Darwin/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/asan/TestCases/Helpers/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/asan/TestCases/Linux/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/asan/TestCases/Posix/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/asan/TestCases/Windows/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/asan/Unit/{lit.site.cfg.in => lit.site.cfg.py.in} (100%) rename compiler-rt/test/asan/{lit.cfg => lit.cfg.py} (99%) rename compiler-rt/test/asan/{lit.site.cfg.in => lit.site.cfg.py.in} (89%) rename compiler-rt/test/builtins/TestCases/Darwin/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/builtins/Unit/{lit.cfg => lit.cfg.py} (98%) rename compiler-rt/test/builtins/Unit/{lit.site.cfg.in => lit.site.cfg.py.in} (98%) rename compiler-rt/test/builtins/{lit.cfg => lit.cfg.py} (100%) rename compiler-rt/test/builtins/{lit.site.cfg.in => lit.site.cfg.py.in} (97%) rename compiler-rt/test/cfi/cross-dso/icall/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/cfi/cross-dso/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/cfi/icall/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/cfi/{lit.cfg => lit.cfg.py} (100%) rename compiler-rt/test/cfi/{lit.site.cfg.in => lit.site.cfg.py.in} (98%) rename compiler-rt/test/crt/{lit.cfg => lit.cfg.py} (100%) rename compiler-rt/test/crt/{lit.site.cfg.in => lit.site.cfg.py.in} (88%) rename compiler-rt/test/dfsan/{lit.cfg => lit.cfg.py} (100%) rename compiler-rt/test/dfsan/{lit.site.cfg.in => lit.site.cfg.py.in} (85%) rename compiler-rt/test/fuzzer/{lit.cfg => lit.cfg.py} (100%) rename compiler-rt/test/fuzzer/{lit.site.cfg.in => lit.site.cfg.py.in} (99%) rename compiler-rt/test/fuzzer/unit/{lit.site.cfg.in => lit.site.cfg.py.in} (100%) rename compiler-rt/test/gwp_asan/{lit.cfg => lit.cfg.py} (100%) rename compiler-rt/test/gwp_asan/{lit.site.cfg.in => lit.site.cfg.py.in} (98%) rename compiler-rt/test/gwp_asan/unit/{lit.site.cfg.in => lit.site.cfg.py.in} (100%) rename compiler-rt/test/hwasan/TestCases/Linux/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/hwasan/TestCases/Posix/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/hwasan/{lit.cfg => lit.cfg.py} (100%) rename compiler-rt/test/hwasan/{lit.site.cfg.in => lit.site.cfg.py.in} (87%) rename compiler-rt/test/interception/Unit/{lit.site.cfg.in => lit.site.cfg.py.in} (100%) rename compiler-rt/test/{lit.common.cfg => lit.common.cfg.py} (99%) rename compiler-rt/test/lsan/TestCases/Darwin/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/lsan/TestCases/Linux/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/lsan/TestCases/Posix/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/lsan/{lit.common.cfg => lit.common.cfg.py} (98%) rename compiler-rt/test/lsan/{lit.site.cfg.in => lit.site.cfg.py.in} (98%) rename compiler-rt/test/msan/Linux/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/msan/Unit/{lit.site.cfg.in => lit.site.cfg.py.in} (100%) rename compiler-rt/test/msan/{lit.cfg => lit.cfg.py} (100%) rename compiler-rt/test/msan/{lit.site.cfg.in => lit.site.cfg.py.in} (87%) rename compiler-rt/test/profile/Linux/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/profile/Posix/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/profile/{lit.cfg => lit.cfg.py} (98%) rename compiler-rt/test/profile/{lit.site.cfg.in => lit.site.cfg.py.in} (98%) rename compiler-rt/test/safestack/{lit.cfg => lit.cfg.py} (100%) rename compiler-rt/test/safestack/{lit.site.cfg.in => lit.site.cfg.py.in} (97%) rename compiler-rt/test/sanitizer_common/TestCases/Darwin/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/sanitizer_common/TestCases/FreeBSD/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/sanitizer_common/TestCases/Linux/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/sanitizer_common/TestCases/NetBSD/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/sanitizer_common/TestCases/Posix/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/sanitizer_common/Unit/{lit.site.cfg.in => lit.site.cfg.py.in} (100%) rename compiler-rt/test/sanitizer_common/{lit.common.cfg => lit.common.cfg.py} (100%) rename compiler-rt/test/sanitizer_common/{lit.site.cfg.in => lit.site.cfg.py.in} (96%) rename compiler-rt/test/scudo/{lit.cfg => lit.cfg.py} (100%) rename compiler-rt/test/scudo/{lit.site.cfg.in => lit.site.cfg.py.in} (84%) rename compiler-rt/test/scudo/standalone/unit/{lit.site.cfg.in => lit.site.cfg.py.in} (100%) rename compiler-rt/test/shadowcallstack/{lit.cfg => lit.cfg.py} (100%) rename compiler-rt/test/shadowcallstack/{lit.site.cfg.in => lit.site.cfg.py.in} (97%) rename compiler-rt/test/tsan/Darwin/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/tsan/Linux/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/tsan/Unit/{lit.site.cfg.in => lit.site.cfg.py.in} (98%) rename compiler-rt/test/tsan/libcxx/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/tsan/libdispatch/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/tsan/{lit.cfg => lit.cfg.py} (98%) rename compiler-rt/test/tsan/{lit.site.cfg.in => lit.site.cfg.py.in} (98%) rename compiler-rt/test/ubsan/TestCases/Misc/Linux/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/ubsan/TestCases/TypeCheck/Function/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/ubsan/TestCases/TypeCheck/Linux/{lit.local.cfg => lit.local.cfg.py} (100%) rename compiler-rt/test/ubsan/{lit.common.cfg => lit.common.cfg.py} (98%) rename compiler-rt/test/ubsan/{lit.site.cfg.in => lit.site.cfg.py.in} (98%) rename compiler-rt/test/ubsan_minimal/{lit.common.cfg => lit.common.cfg.py} (97%) rename compiler-rt/test/ubsan_minimal/{lit.site.cfg.in => lit.site.cfg.py.in} (97%) rename compiler-rt/test/xray/Unit/{lit.site.cfg.in => lit.site.cfg.py.in} (100%) rename compiler-rt/test/xray/{lit.cfg => lit.cfg.py} (100%) rename compiler-rt/test/xray/{lit.site.cfg.in => lit.site.cfg.py.in} (99%) rename compiler-rt/unittests/{lit.common.unit.cfg => lit.common.unit.cfg.py} (100%) diff --git a/compiler-rt/test/asan/CMakeLists.txt b/compiler-rt/test/asan/CMakeLists.txt index 2a44aebd55dd..c5ae2870beb3 100644 --- a/compiler-rt/test/asan/CMakeLists.txt +++ b/compiler-rt/test/asan/CMakeLists.txt @@ -58,8 +58,8 @@ foreach(arch ${ASAN_TEST_ARCH}) string(TOUPPER ${arch} ARCH_UPPER_CASE) set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}Config) configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py ) list(APPEND ASAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) @@ -68,8 +68,8 @@ foreach(arch ${ASAN_TEST_ARCH}) set(ASAN_TEST_DYNAMIC True) set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}DynamicConfig) configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg) + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py) list(APPEND ASAN_DYNAMIC_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) endif() @@ -95,8 +95,8 @@ if(APPLE) string(TOUPPER ${arch} ARCH_UPPER_CASE) set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config") configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py ) add_lit_testsuite(check-asan-iossim-${arch} "AddressSanitizer iOS Simulator ${arch} tests" ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ @@ -112,8 +112,8 @@ if(APPLE) string(TOUPPER ${arch} ARCH_UPPER_CASE) set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config") configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py ) add_lit_testsuite(check-asan-ios-${arch} "AddressSanitizer iOS ${arch} tests" ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ @@ -127,13 +127,13 @@ endif() if(COMPILER_RT_INCLUDE_TESTS) set(ASAN_TEST_DYNAMIC False) 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) if(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME) set(ASAN_TEST_DYNAMIC True) configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/Unit/dynamic/lit.site.cfg) + ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/Unit/dynamic/lit.site.cfg.py) endif() # FIXME: support unit test in the android test runner if (NOT ANDROID) diff --git a/compiler-rt/test/asan/TestCases/Android/lit.local.cfg b/compiler-rt/test/asan/TestCases/Android/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/asan/TestCases/Android/lit.local.cfg rename to compiler-rt/test/asan/TestCases/Android/lit.local.cfg.py diff --git a/compiler-rt/test/asan/TestCases/Darwin/lit.local.cfg b/compiler-rt/test/asan/TestCases/Darwin/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/asan/TestCases/Darwin/lit.local.cfg rename to compiler-rt/test/asan/TestCases/Darwin/lit.local.cfg.py diff --git a/compiler-rt/test/asan/TestCases/Helpers/lit.local.cfg b/compiler-rt/test/asan/TestCases/Helpers/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/asan/TestCases/Helpers/lit.local.cfg rename to compiler-rt/test/asan/TestCases/Helpers/lit.local.cfg.py diff --git a/compiler-rt/test/asan/TestCases/Linux/lit.local.cfg b/compiler-rt/test/asan/TestCases/Linux/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/asan/TestCases/Linux/lit.local.cfg rename to compiler-rt/test/asan/TestCases/Linux/lit.local.cfg.py diff --git a/compiler-rt/test/asan/TestCases/Posix/lit.local.cfg b/compiler-rt/test/asan/TestCases/Posix/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/asan/TestCases/Posix/lit.local.cfg rename to compiler-rt/test/asan/TestCases/Posix/lit.local.cfg.py diff --git a/compiler-rt/test/asan/TestCases/Windows/lit.local.cfg b/compiler-rt/test/asan/TestCases/Windows/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/asan/TestCases/Windows/lit.local.cfg rename to compiler-rt/test/asan/TestCases/Windows/lit.local.cfg.py diff --git a/compiler-rt/test/asan/Unit/lit.site.cfg.in b/compiler-rt/test/asan/Unit/lit.site.cfg.py.in similarity index 100% rename from compiler-rt/test/asan/Unit/lit.site.cfg.in rename to compiler-rt/test/asan/Unit/lit.site.cfg.py.in diff --git a/compiler-rt/test/asan/lit.cfg b/compiler-rt/test/asan/lit.cfg.py similarity index 99% rename from compiler-rt/test/asan/lit.cfg rename to compiler-rt/test/asan/lit.cfg.py index 132623f5e107..e94a65304c45 100644 --- a/compiler-rt/test/asan/lit.cfg +++ b/compiler-rt/test/asan/lit.cfg.py @@ -21,7 +21,7 @@ def get_required_attr(config, attr_name): lit_config.fatal( "No attribute %r in test configuration! You may need to run " "tests from your build directory or add this attribute " - "to lit.site.cfg " % attr_name) + "to lit.site.cfg.py " % attr_name) return attr_value def push_dynamic_library_lookup_path(config, new_path): diff --git a/compiler-rt/test/asan/lit.site.cfg.in b/compiler-rt/test/asan/lit.site.cfg.py.in similarity index 89% rename from compiler-rt/test/asan/lit.site.cfg.in rename to compiler-rt/test/asan/lit.site.cfg.py.in index 6282fd881e5d..f76b306f8577 100644 --- a/compiler-rt/test/asan/lit.site.cfg.in +++ b/compiler-rt/test/asan/lit.site.cfg.py.in @@ -13,4 +13,4 @@ config.target_arch = "@ASAN_TEST_TARGET_ARCH@" lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") # Load tool-specific config that would do the real work. -lit_config.load_config(config, "@ASAN_LIT_SOURCE_DIR@/lit.cfg") +lit_config.load_config(config, "@ASAN_LIT_SOURCE_DIR@/lit.cfg.py") diff --git a/compiler-rt/test/builtins/CMakeLists.txt b/compiler-rt/test/builtins/CMakeLists.txt index eb4391fcab48..43b7e295acbd 100644 --- a/compiler-rt/test/builtins/CMakeLists.txt +++ b/compiler-rt/test/builtins/CMakeLists.txt @@ -5,8 +5,8 @@ set(BUILTINS_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/TestCases) # Test cases. 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 ) #Unit tests. @@ -44,8 +44,8 @@ foreach(arch ${BUILTIN_SUPPORTED_ARCH}) string(TOUPPER ${arch} ARCH_UPPER_CASE) set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}Config) configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/Unit/${CONFIG_NAME}/lit.site.cfg + ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/Unit/${CONFIG_NAME}/lit.site.cfg.py ) list(APPEND BUILTINS_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Unit/${CONFIG_NAME}) endforeach() diff --git a/compiler-rt/test/builtins/TestCases/Darwin/lit.local.cfg b/compiler-rt/test/builtins/TestCases/Darwin/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/builtins/TestCases/Darwin/lit.local.cfg rename to compiler-rt/test/builtins/TestCases/Darwin/lit.local.cfg.py diff --git a/compiler-rt/test/builtins/Unit/lit.cfg b/compiler-rt/test/builtins/Unit/lit.cfg.py similarity index 98% rename from compiler-rt/test/builtins/Unit/lit.cfg rename to compiler-rt/test/builtins/Unit/lit.cfg.py index d5fa73b0c64d..3d7e8bf9ca94 100644 --- a/compiler-rt/test/builtins/Unit/lit.cfg +++ b/compiler-rt/test/builtins/Unit/lit.cfg.py @@ -11,7 +11,7 @@ def get_required_attr(config, attr_name): lit_config.fatal( "No attribute %r in test configuration! You may need to run " "tests from your build directory or add this attribute " - "to lit.site.cfg " % attr_name) + "to lit.site.cfg.py " % attr_name) return attr_value # Setup config name. diff --git a/compiler-rt/test/builtins/Unit/lit.site.cfg.in b/compiler-rt/test/builtins/Unit/lit.site.cfg.py.in similarity index 98% rename from compiler-rt/test/builtins/Unit/lit.site.cfg.in rename to compiler-rt/test/builtins/Unit/lit.site.cfg.py.in index 75d70f703238..10af443139d6 100644 --- a/compiler-rt/test/builtins/Unit/lit.site.cfg.in +++ b/compiler-rt/test/builtins/Unit/lit.site.cfg.py.in @@ -10,4 +10,4 @@ config.builtins_is_msvc = @BUILTINS_IS_MSVC_PYBOOL@ lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") # Load tool-specific config that would do the real work. -lit_config.load_config(config, "@BUILTINS_LIT_SOURCE_DIR@/Unit/lit.cfg") +lit_config.load_config(config, "@BUILTINS_LIT_SOURCE_DIR@/Unit/lit.cfg.py") diff --git a/compiler-rt/test/builtins/lit.cfg b/compiler-rt/test/builtins/lit.cfg.py similarity index 100% rename from compiler-rt/test/builtins/lit.cfg rename to compiler-rt/test/builtins/lit.cfg.py diff --git a/compiler-rt/test/builtins/lit.site.cfg.in b/compiler-rt/test/builtins/lit.site.cfg.py.in similarity index 97% rename from compiler-rt/test/builtins/lit.site.cfg.in rename to compiler-rt/test/builtins/lit.site.cfg.py.in index c7fe82f949df..cbd28938d44d 100644 --- a/compiler-rt/test/builtins/lit.site.cfg.in +++ b/compiler-rt/test/builtins/lit.site.cfg.py.in @@ -4,4 +4,4 @@ lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") # Load tool-specific config that would do the real work. -lit_config.load_config(config, "@BUILTINS_LIT_SOURCE_DIR@/lit.cfg") +lit_config.load_config(config, "@BUILTINS_LIT_SOURCE_DIR@/lit.cfg.py") diff --git a/compiler-rt/test/cfi/CMakeLists.txt b/compiler-rt/test/cfi/CMakeLists.txt index d99213632d00..9b6ef0f67cba 100644 --- a/compiler-rt/test/cfi/CMakeLists.txt +++ b/compiler-rt/test/cfi/CMakeLists.txt @@ -20,16 +20,16 @@ macro (add_cfi_test_suites lld thinlto newpm) set(CFI_LIT_TEST_MODE Standalone) set(CFI_TEST_CONFIG_SUFFIX -standalone${suffix}) configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/Standalone${suffix}/lit.site.cfg + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/Standalone${suffix}/lit.site.cfg.py ) list(APPEND CFI_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Standalone${suffix}) set(CFI_LIT_TEST_MODE Devirt) set(CFI_TEST_CONFIG_SUFFIX -devirt${suffix}) configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/Devirt${suffix}/lit.site.cfg + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/Devirt${suffix}/lit.site.cfg.py ) list(APPEND CFI_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Devirt${suffix}) endmacro() diff --git a/compiler-rt/test/cfi/cross-dso/icall/lit.local.cfg b/compiler-rt/test/cfi/cross-dso/icall/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/cfi/cross-dso/icall/lit.local.cfg rename to compiler-rt/test/cfi/cross-dso/icall/lit.local.cfg.py diff --git a/compiler-rt/test/cfi/cross-dso/lit.local.cfg b/compiler-rt/test/cfi/cross-dso/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/cfi/cross-dso/lit.local.cfg rename to compiler-rt/test/cfi/cross-dso/lit.local.cfg.py diff --git a/compiler-rt/test/cfi/icall/lit.local.cfg b/compiler-rt/test/cfi/icall/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/cfi/icall/lit.local.cfg rename to compiler-rt/test/cfi/icall/lit.local.cfg.py diff --git a/compiler-rt/test/cfi/lit.cfg b/compiler-rt/test/cfi/lit.cfg.py similarity index 100% rename from compiler-rt/test/cfi/lit.cfg rename to compiler-rt/test/cfi/lit.cfg.py diff --git a/compiler-rt/test/cfi/lit.site.cfg.in b/compiler-rt/test/cfi/lit.site.cfg.py.in similarity index 98% rename from compiler-rt/test/cfi/lit.site.cfg.in rename to compiler-rt/test/cfi/lit.site.cfg.py.in index a735e8812acd..7e150f3a5054 100644 --- a/compiler-rt/test/cfi/lit.site.cfg.in +++ b/compiler-rt/test/cfi/lit.site.cfg.py.in @@ -10,4 +10,4 @@ config.use_thinlto = @CFI_TEST_USE_THINLTO@ config.use_newpm = @CFI_TEST_USE_NEWPM@ lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") -lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg") +lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg.py") diff --git a/compiler-rt/test/crt/CMakeLists.txt b/compiler-rt/test/crt/CMakeLists.txt index 253b76a8cdcc..4026b0f37b34 100644 --- a/compiler-rt/test/crt/CMakeLists.txt +++ b/compiler-rt/test/crt/CMakeLists.txt @@ -22,8 +22,8 @@ if (COMPILER_RT_BUILD_CRT AND COMPILER_RT_HAS_CRT) set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}Config) configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg) + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py) list(APPEND CRT_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) endforeach() endif() diff --git a/compiler-rt/test/crt/lit.cfg b/compiler-rt/test/crt/lit.cfg.py similarity index 100% rename from compiler-rt/test/crt/lit.cfg rename to compiler-rt/test/crt/lit.cfg.py diff --git a/compiler-rt/test/crt/lit.site.cfg.in b/compiler-rt/test/crt/lit.site.cfg.py.in similarity index 88% rename from compiler-rt/test/crt/lit.site.cfg.in rename to compiler-rt/test/crt/lit.site.cfg.py.in index a9a0ce0f3bdb..53eda0c45948 100644 --- a/compiler-rt/test/crt/lit.site.cfg.in +++ b/compiler-rt/test/crt/lit.site.cfg.py.in @@ -11,4 +11,4 @@ config.sanitizer_cxx_lib = "@SANITIZER_TEST_CXX_LIBNAME@" lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") # Load tool-specific config that would do the real work. -lit_config.load_config(config, "@CRT_LIT_SOURCE_DIR@/lit.cfg") +lit_config.load_config(config, "@CRT_LIT_SOURCE_DIR@/lit.cfg.py") diff --git a/compiler-rt/test/dfsan/CMakeLists.txt b/compiler-rt/test/dfsan/CMakeLists.txt index 04035faeddfe..168f046238db 100644 --- a/compiler-rt/test/dfsan/CMakeLists.txt +++ b/compiler-rt/test/dfsan/CMakeLists.txt @@ -15,8 +15,8 @@ foreach(arch ${DFSAN_TEST_ARCH}) set(CONFIG_NAME ${ARCH_UPPER_CASE}Config) configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg) + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py) list(APPEND DFSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) endforeach() diff --git a/compiler-rt/test/dfsan/lit.cfg b/compiler-rt/test/dfsan/lit.cfg.py similarity index 100% rename from compiler-rt/test/dfsan/lit.cfg rename to compiler-rt/test/dfsan/lit.cfg.py diff --git a/compiler-rt/test/dfsan/lit.site.cfg.in b/compiler-rt/test/dfsan/lit.site.cfg.py.in similarity index 85% rename from compiler-rt/test/dfsan/lit.site.cfg.in rename to compiler-rt/test/dfsan/lit.site.cfg.py.in index 927ba11418ea..bfa09c07de4c 100644 --- a/compiler-rt/test/dfsan/lit.site.cfg.in +++ b/compiler-rt/test/dfsan/lit.site.cfg.py.in @@ -9,4 +9,4 @@ config.target_arch = "@DFSAN_TEST_TARGET_ARCH@" lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") # Load tool-specific config that would do the real work. -lit_config.load_config(config, "@DFSAN_LIT_TESTS_DIR@/lit.cfg") +lit_config.load_config(config, "@DFSAN_LIT_TESTS_DIR@/lit.cfg.py") diff --git a/compiler-rt/test/fuzzer/CMakeLists.txt b/compiler-rt/test/fuzzer/CMakeLists.txt index 8e9f12dd1225..62161d0019bb 100644 --- a/compiler-rt/test/fuzzer/CMakeLists.txt +++ b/compiler-rt/test/fuzzer/CMakeLists.txt @@ -27,8 +27,8 @@ add_custom_target(check-fuzzer) if(COMPILER_RT_INCLUDE_TESTS) # libFuzzer unit tests. 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) add_lit_testsuite(check-fuzzer-unit "Running Fuzzer unit tests" ${CMAKE_CURRENT_BINARY_DIR}/unit DEPENDS ${LIBFUZZER_TEST_DEPS}) @@ -61,8 +61,8 @@ macro(test_fuzzer stdlib) # LIT-based libFuzzer tests. configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py ) add_lit_testsuite(check-fuzzer-${stdlib_name}-${arch} @@ -99,8 +99,8 @@ if (APPLE) string(TOUPPER ${arch} ARCH_UPPER_CASE) set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config") configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py ) add_lit_testsuite(check-fuzzer-ios-${arch} "libFuzzer iOS ${arch} tests" ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ diff --git a/compiler-rt/test/fuzzer/lit.cfg b/compiler-rt/test/fuzzer/lit.cfg.py similarity index 100% rename from compiler-rt/test/fuzzer/lit.cfg rename to compiler-rt/test/fuzzer/lit.cfg.py diff --git a/compiler-rt/test/fuzzer/lit.site.cfg.in b/compiler-rt/test/fuzzer/lit.site.cfg.py.in similarity index 99% rename from compiler-rt/test/fuzzer/lit.site.cfg.in rename to compiler-rt/test/fuzzer/lit.site.cfg.py.in index e48be2f4c6c1..cc6a0908d142 100644 --- a/compiler-rt/test/fuzzer/lit.site.cfg.in +++ b/compiler-rt/test/fuzzer/lit.site.cfg.py.in @@ -22,4 +22,4 @@ if config.enable_per_target_runtime_dir: else: config.runtime_library_dir = "@LLVM_LIBRARY_DIR@" -lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg") +lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg.py") diff --git a/compiler-rt/test/fuzzer/unit/lit.site.cfg.in b/compiler-rt/test/fuzzer/unit/lit.site.cfg.py.in similarity index 100% rename from compiler-rt/test/fuzzer/unit/lit.site.cfg.in rename to compiler-rt/test/fuzzer/unit/lit.site.cfg.py.in diff --git a/compiler-rt/test/gwp_asan/CMakeLists.txt b/compiler-rt/test/gwp_asan/CMakeLists.txt index 06fc867566c5..95796521f31d 100644 --- a/compiler-rt/test/gwp_asan/CMakeLists.txt +++ b/compiler-rt/test/gwp_asan/CMakeLists.txt @@ -17,8 +17,8 @@ set(GWP_ASAN_TEST_DEPS if (COMPILER_RT_INCLUDE_TESTS AND COMPILER_RT_HAS_GWP_ASAN AND NOT ANDROID) list(APPEND GWP_ASAN_TEST_DEPS GwpAsanUnitTests) 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) add_lit_testsuite(check-gwp_asan-unit "Running GWP-ASan unit tests" ${CMAKE_CURRENT_BINARY_DIR}/unit DEPENDS ${GWP_ASAN_TEST_DEPS}) @@ -28,8 +28,8 @@ if (COMPILER_RT_INCLUDE_TESTS AND COMPILER_RT_HAS_GWP_ASAN AND NOT ANDROID) endif() 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 ) foreach(arch ${GWP_ASAN_SUPPORTED_ARCH}) @@ -40,8 +40,8 @@ foreach(arch ${GWP_ASAN_SUPPORTED_ARCH}) set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}Config) configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg) + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py) list(APPEND GWP_ASAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) endforeach() diff --git a/compiler-rt/test/gwp_asan/lit.cfg b/compiler-rt/test/gwp_asan/lit.cfg.py similarity index 100% rename from compiler-rt/test/gwp_asan/lit.cfg rename to compiler-rt/test/gwp_asan/lit.cfg.py diff --git a/compiler-rt/test/gwp_asan/lit.site.cfg.in b/compiler-rt/test/gwp_asan/lit.site.cfg.py.in similarity index 98% rename from compiler-rt/test/gwp_asan/lit.site.cfg.in rename to compiler-rt/test/gwp_asan/lit.site.cfg.py.in index 1fb1c1955f61..5bb57b56e1c7 100644 --- a/compiler-rt/test/gwp_asan/lit.site.cfg.in +++ b/compiler-rt/test/gwp_asan/lit.site.cfg.py.in @@ -8,4 +8,4 @@ config.target_cflags = "@GWP_ASAN_TEST_TARGET_CFLAGS@" lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") # Load tool-specific config that would do the real work. -lit_config.load_config(config, "@GWP_ASAN_LIT_SOURCE_DIR@/lit.cfg") +lit_config.load_config(config, "@GWP_ASAN_LIT_SOURCE_DIR@/lit.cfg.py") diff --git a/compiler-rt/test/gwp_asan/unit/lit.site.cfg.in b/compiler-rt/test/gwp_asan/unit/lit.site.cfg.py.in similarity index 100% rename from compiler-rt/test/gwp_asan/unit/lit.site.cfg.in rename to compiler-rt/test/gwp_asan/unit/lit.site.cfg.py.in diff --git a/compiler-rt/test/hwasan/CMakeLists.txt b/compiler-rt/test/hwasan/CMakeLists.txt index 3e397ac067f2..632309ae75e7 100644 --- a/compiler-rt/test/hwasan/CMakeLists.txt +++ b/compiler-rt/test/hwasan/CMakeLists.txt @@ -15,8 +15,8 @@ foreach(arch ${HWASAN_TEST_ARCH}) set(HWASAN_ANDROID_FILES_TO_PUSH []) configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg) + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py) list(APPEND HWASAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) endforeach() diff --git a/compiler-rt/test/hwasan/TestCases/Linux/lit.local.cfg b/compiler-rt/test/hwasan/TestCases/Linux/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/hwasan/TestCases/Linux/lit.local.cfg rename to compiler-rt/test/hwasan/TestCases/Linux/lit.local.cfg.py diff --git a/compiler-rt/test/hwasan/TestCases/Posix/lit.local.cfg b/compiler-rt/test/hwasan/TestCases/Posix/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/hwasan/TestCases/Posix/lit.local.cfg rename to compiler-rt/test/hwasan/TestCases/Posix/lit.local.cfg.py diff --git a/compiler-rt/test/hwasan/lit.cfg b/compiler-rt/test/hwasan/lit.cfg.py similarity index 100% rename from compiler-rt/test/hwasan/lit.cfg rename to compiler-rt/test/hwasan/lit.cfg.py diff --git a/compiler-rt/test/hwasan/lit.site.cfg.in b/compiler-rt/test/hwasan/lit.site.cfg.py.in similarity index 87% rename from compiler-rt/test/hwasan/lit.site.cfg.in rename to compiler-rt/test/hwasan/lit.site.cfg.py.in index e95ea92cd2d9..8b6abd8f2e9f 100644 --- a/compiler-rt/test/hwasan/lit.site.cfg.in +++ b/compiler-rt/test/hwasan/lit.site.cfg.py.in @@ -10,4 +10,4 @@ config.android_files_to_push = @HWASAN_ANDROID_FILES_TO_PUSH@ lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") # Load tool-specific config that would do the real work. -lit_config.load_config(config, "@HWASAN_LIT_SOURCE_DIR@/lit.cfg") +lit_config.load_config(config, "@HWASAN_LIT_SOURCE_DIR@/lit.cfg.py") diff --git a/compiler-rt/test/interception/CMakeLists.txt b/compiler-rt/test/interception/CMakeLists.txt index ff9e4b0adb86..b8e2faa59fad 100644 --- a/compiler-rt/test/interception/CMakeLists.txt +++ b/compiler-rt/test/interception/CMakeLists.txt @@ -5,8 +5,8 @@ set(INTERCEPTION_TESTSUITES) # Android targets. if(COMPILER_RT_INCLUDE_TESTS AND NOT ANDROID AND NOT APPLE) 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) list(APPEND INTERCEPTION_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Unit) list(APPEND INTERCEPTION_TEST_DEPS InterceptionUnitTests) endif() diff --git a/compiler-rt/test/interception/Unit/lit.site.cfg.in b/compiler-rt/test/interception/Unit/lit.site.cfg.py.in similarity index 100% rename from compiler-rt/test/interception/Unit/lit.site.cfg.in rename to compiler-rt/test/interception/Unit/lit.site.cfg.py.in diff --git a/compiler-rt/test/lit.common.cfg b/compiler-rt/test/lit.common.cfg.py similarity index 99% rename from compiler-rt/test/lit.common.cfg rename to compiler-rt/test/lit.common.cfg.py index c41f64a44c05..af0721ad1d19 100644 --- a/compiler-rt/test/lit.common.cfg +++ b/compiler-rt/test/lit.common.cfg.py @@ -2,7 +2,7 @@ # Configuration file for 'lit' test runner. # This file contains common rules for various compiler-rt testsuites. -# It is mostly copied from lit.cfg used by Clang. +# It is mostly copied from lit.cfg.py used by Clang. import os import platform import re diff --git a/compiler-rt/test/lit.common.configured.in b/compiler-rt/test/lit.common.configured.in index 21eb9f80c650..5ca95efd530c 100644 --- a/compiler-rt/test/lit.common.configured.in +++ b/compiler-rt/test/lit.common.configured.in @@ -66,4 +66,4 @@ if not os.path.exists(config.clang): lit_config.fatal("Can't find compiler on path %r" % config.clang) # Setup attributes common for all compiler-rt projects. -lit_config.load_config(config, "@COMPILER_RT_SOURCE_DIR@/test/lit.common.cfg") +lit_config.load_config(config, "@COMPILER_RT_SOURCE_DIR@/test/lit.common.cfg.py") diff --git a/compiler-rt/test/lsan/CMakeLists.txt b/compiler-rt/test/lsan/CMakeLists.txt index 3324928ddb1c..b3099956d4b4 100644 --- a/compiler-rt/test/lsan/CMakeLists.txt +++ b/compiler-rt/test/lsan/CMakeLists.txt @@ -16,16 +16,16 @@ foreach(arch ${LSAN_TEST_ARCH}) set(CONFIG_NAME ${ARCH_UPPER_CASE}LsanConfig) configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg) + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py) list(APPEND LSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) set(CONFIG_NAME ${ARCH_UPPER_CASE}AsanConfig) set(LSAN_LIT_TEST_MODE "AddressSanitizer") configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg) + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py) list(APPEND LSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) endforeach() diff --git a/compiler-rt/test/lsan/TestCases/Darwin/lit.local.cfg b/compiler-rt/test/lsan/TestCases/Darwin/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/lsan/TestCases/Darwin/lit.local.cfg rename to compiler-rt/test/lsan/TestCases/Darwin/lit.local.cfg.py diff --git a/compiler-rt/test/lsan/TestCases/Linux/lit.local.cfg b/compiler-rt/test/lsan/TestCases/Linux/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/lsan/TestCases/Linux/lit.local.cfg rename to compiler-rt/test/lsan/TestCases/Linux/lit.local.cfg.py diff --git a/compiler-rt/test/lsan/TestCases/Posix/lit.local.cfg b/compiler-rt/test/lsan/TestCases/Posix/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/lsan/TestCases/Posix/lit.local.cfg rename to compiler-rt/test/lsan/TestCases/Posix/lit.local.cfg.py diff --git a/compiler-rt/test/lsan/lit.common.cfg b/compiler-rt/test/lsan/lit.common.cfg.py similarity index 98% rename from compiler-rt/test/lsan/lit.common.cfg rename to compiler-rt/test/lsan/lit.common.cfg.py index a5df951e2e04..7548b10c22ef 100644 --- a/compiler-rt/test/lsan/lit.common.cfg +++ b/compiler-rt/test/lsan/lit.common.cfg.py @@ -13,7 +13,7 @@ def get_required_attr(config, attr_name): lit_config.fatal( "No attribute %r in test configuration! You may need to run " "tests from your build directory or add this attribute " - "to lit.site.cfg " % attr_name) + "to lit.site.cfg.py " % attr_name) return attr_value # Setup source root. diff --git a/compiler-rt/test/lsan/lit.site.cfg.in b/compiler-rt/test/lsan/lit.site.cfg.py.in similarity index 98% rename from compiler-rt/test/lsan/lit.site.cfg.in rename to compiler-rt/test/lsan/lit.site.cfg.py.in index de893474d280..bef4d42d2025 100644 --- a/compiler-rt/test/lsan/lit.site.cfg.in +++ b/compiler-rt/test/lsan/lit.site.cfg.py.in @@ -10,4 +10,4 @@ config.target_arch = "@LSAN_TEST_TARGET_ARCH@" lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") # Load tool-specific config that would do the real work. -lit_config.load_config(config, "@LSAN_LIT_SOURCE_DIR@/lit.common.cfg") +lit_config.load_config(config, "@LSAN_LIT_SOURCE_DIR@/lit.common.cfg.py") diff --git a/compiler-rt/test/msan/CMakeLists.txt b/compiler-rt/test/msan/CMakeLists.txt index c6408c1edb03..539f2d15663d 100644 --- a/compiler-rt/test/msan/CMakeLists.txt +++ b/compiler-rt/test/msan/CMakeLists.txt @@ -26,8 +26,8 @@ macro(add_msan_testsuite arch lld thinlto) set(MSAN_TEST_USE_LLD ${lld}) configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg) + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py) list(APPEND MSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) endmacro() @@ -47,8 +47,8 @@ if(COMPILER_RT_INCLUDE_TESTS AND COMPILER_RT_LIBCXX_PATH AND COMPILER_RT_LIBCXXABI_PATH) 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) list(APPEND MSAN_TEST_DEPS MsanUnitTests) list(APPEND MSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Unit) endif() diff --git a/compiler-rt/test/msan/Linux/lit.local.cfg b/compiler-rt/test/msan/Linux/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/msan/Linux/lit.local.cfg rename to compiler-rt/test/msan/Linux/lit.local.cfg.py diff --git a/compiler-rt/test/msan/Unit/lit.site.cfg.in b/compiler-rt/test/msan/Unit/lit.site.cfg.py.in similarity index 100% rename from compiler-rt/test/msan/Unit/lit.site.cfg.in rename to compiler-rt/test/msan/Unit/lit.site.cfg.py.in diff --git a/compiler-rt/test/msan/lit.cfg b/compiler-rt/test/msan/lit.cfg.py similarity index 100% rename from compiler-rt/test/msan/lit.cfg rename to compiler-rt/test/msan/lit.cfg.py diff --git a/compiler-rt/test/msan/lit.site.cfg.in b/compiler-rt/test/msan/lit.site.cfg.py.in similarity index 87% rename from compiler-rt/test/msan/lit.site.cfg.in rename to compiler-rt/test/msan/lit.site.cfg.py.in index f744d71fd66c..47264d098694 100644 --- a/compiler-rt/test/msan/lit.site.cfg.in +++ b/compiler-rt/test/msan/lit.site.cfg.py.in @@ -11,4 +11,4 @@ config.use_thinlto = @MSAN_TEST_USE_THINLTO@ lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") # Load tool-specific config that would do the real work. -lit_config.load_config(config, "@MSAN_LIT_SOURCE_DIR@/lit.cfg") +lit_config.load_config(config, "@MSAN_LIT_SOURCE_DIR@/lit.cfg.py") diff --git a/compiler-rt/test/profile/CMakeLists.txt b/compiler-rt/test/profile/CMakeLists.txt index 5a4cfa1012b0..4b031306594f 100644 --- a/compiler-rt/test/profile/CMakeLists.txt +++ b/compiler-rt/test/profile/CMakeLists.txt @@ -17,8 +17,8 @@ foreach(arch ${PROFILE_TEST_ARCH}) get_test_cc_for_arch(${arch} PROFILE_TEST_TARGET_CC PROFILE_TEST_TARGET_CFLAGS) set(CONFIG_NAME Profile-${arch}) configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py ) list(APPEND PROFILE_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) endforeach() diff --git a/compiler-rt/test/profile/Linux/lit.local.cfg b/compiler-rt/test/profile/Linux/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/profile/Linux/lit.local.cfg rename to compiler-rt/test/profile/Linux/lit.local.cfg.py diff --git a/compiler-rt/test/profile/Posix/lit.local.cfg b/compiler-rt/test/profile/Posix/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/profile/Posix/lit.local.cfg rename to compiler-rt/test/profile/Posix/lit.local.cfg.py diff --git a/compiler-rt/test/profile/lit.cfg b/compiler-rt/test/profile/lit.cfg.py similarity index 98% rename from compiler-rt/test/profile/lit.cfg rename to compiler-rt/test/profile/lit.cfg.py index e59407d7266f..bda1e28a2c9d 100644 --- a/compiler-rt/test/profile/lit.cfg +++ b/compiler-rt/test/profile/lit.cfg.py @@ -8,7 +8,7 @@ def get_required_attr(config, attr_name): lit_config.fatal( "No attribute %r in test configuration! You may need to run " "tests from your build directory or add this attribute " - "to lit.site.cfg " % attr_name) + "to lit.site.cfg.py " % attr_name) return attr_value # Setup config name. diff --git a/compiler-rt/test/profile/lit.site.cfg.in b/compiler-rt/test/profile/lit.site.cfg.py.in similarity index 98% rename from compiler-rt/test/profile/lit.site.cfg.in rename to compiler-rt/test/profile/lit.site.cfg.py.in index 1cb61b51ccb1..bb81fb0c93f7 100644 --- a/compiler-rt/test/profile/lit.site.cfg.in +++ b/compiler-rt/test/profile/lit.site.cfg.py.in @@ -9,4 +9,4 @@ config.target_arch = "@PROFILE_TEST_TARGET_ARCH@" lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") # Load tool-specific config that would do the real work. -lit_config.load_config(config, "@PROFILE_LIT_SOURCE_DIR@/lit.cfg") +lit_config.load_config(config, "@PROFILE_LIT_SOURCE_DIR@/lit.cfg.py") diff --git a/compiler-rt/test/safestack/CMakeLists.txt b/compiler-rt/test/safestack/CMakeLists.txt index e30a676d74a1..d1a33b89e83a 100644 --- a/compiler-rt/test/safestack/CMakeLists.txt +++ b/compiler-rt/test/safestack/CMakeLists.txt @@ -21,8 +21,8 @@ if(NOT COMPILER_RT_STANDALONE_BUILD) endif() 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 ) add_lit_testsuite(check-safestack "Running the SafeStack tests" diff --git a/compiler-rt/test/safestack/lit.cfg b/compiler-rt/test/safestack/lit.cfg.py similarity index 100% rename from compiler-rt/test/safestack/lit.cfg rename to compiler-rt/test/safestack/lit.cfg.py diff --git a/compiler-rt/test/safestack/lit.site.cfg.in b/compiler-rt/test/safestack/lit.site.cfg.py.in similarity index 97% rename from compiler-rt/test/safestack/lit.site.cfg.in rename to compiler-rt/test/safestack/lit.site.cfg.py.in index 6864f39dfb31..3c8bf41b283b 100644 --- a/compiler-rt/test/safestack/lit.site.cfg.in +++ b/compiler-rt/test/safestack/lit.site.cfg.py.in @@ -4,4 +4,4 @@ lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") # Load tool-specific config that would do the real work. -lit_config.load_config(config, "@SAFESTACK_LIT_SOURCE_DIR@/lit.cfg") +lit_config.load_config(config, "@SAFESTACK_LIT_SOURCE_DIR@/lit.cfg.py") diff --git a/compiler-rt/test/sanitizer_common/CMakeLists.txt b/compiler-rt/test/sanitizer_common/CMakeLists.txt index dd251c6ef5ef..48fccf058558 100644 --- a/compiler-rt/test/sanitizer_common/CMakeLists.txt +++ b/compiler-rt/test/sanitizer_common/CMakeLists.txt @@ -66,8 +66,8 @@ foreach(tool ${SUPPORTED_TOOLS}) get_test_cc_for_arch(${arch} SANITIZER_COMMON_TEST_TARGET_CC SANITIZER_COMMON_TEST_TARGET_CFLAGS) set(CONFIG_NAME ${tool}-${arch}-${OS_NAME}) configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg) + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py) # FIXME(dliew): LSan i386 on Darwin is completly broken right now. # so don't run the tests by default. if (NOT (CMAKE_SYSTEM_NAME MATCHES "Darwin" AND @@ -82,8 +82,8 @@ endforeach() # Unit tests. if(COMPILER_RT_INCLUDE_TESTS) 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) # FIXME: support unit test in the android test runner if (NOT ANDROID) list(APPEND SANITIZER_COMMON_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Unit) diff --git a/compiler-rt/test/sanitizer_common/TestCases/Darwin/lit.local.cfg b/compiler-rt/test/sanitizer_common/TestCases/Darwin/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/sanitizer_common/TestCases/Darwin/lit.local.cfg rename to compiler-rt/test/sanitizer_common/TestCases/Darwin/lit.local.cfg.py diff --git a/compiler-rt/test/sanitizer_common/TestCases/FreeBSD/lit.local.cfg b/compiler-rt/test/sanitizer_common/TestCases/FreeBSD/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/sanitizer_common/TestCases/FreeBSD/lit.local.cfg rename to compiler-rt/test/sanitizer_common/TestCases/FreeBSD/lit.local.cfg.py diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/lit.local.cfg b/compiler-rt/test/sanitizer_common/TestCases/Linux/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/sanitizer_common/TestCases/Linux/lit.local.cfg rename to compiler-rt/test/sanitizer_common/TestCases/Linux/lit.local.cfg.py diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/lit.local.cfg b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/sanitizer_common/TestCases/NetBSD/lit.local.cfg rename to compiler-rt/test/sanitizer_common/TestCases/NetBSD/lit.local.cfg.py diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/lit.local.cfg b/compiler-rt/test/sanitizer_common/TestCases/Posix/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/sanitizer_common/TestCases/Posix/lit.local.cfg rename to compiler-rt/test/sanitizer_common/TestCases/Posix/lit.local.cfg.py diff --git a/compiler-rt/test/sanitizer_common/Unit/lit.site.cfg.in b/compiler-rt/test/sanitizer_common/Unit/lit.site.cfg.py.in similarity index 100% rename from compiler-rt/test/sanitizer_common/Unit/lit.site.cfg.in rename to compiler-rt/test/sanitizer_common/Unit/lit.site.cfg.py.in diff --git a/compiler-rt/test/sanitizer_common/lit.common.cfg b/compiler-rt/test/sanitizer_common/lit.common.cfg.py similarity index 100% rename from compiler-rt/test/sanitizer_common/lit.common.cfg rename to compiler-rt/test/sanitizer_common/lit.common.cfg.py diff --git a/compiler-rt/test/sanitizer_common/lit.site.cfg.in b/compiler-rt/test/sanitizer_common/lit.site.cfg.py.in similarity index 96% rename from compiler-rt/test/sanitizer_common/lit.site.cfg.in rename to compiler-rt/test/sanitizer_common/lit.site.cfg.py.in index 414eabad1846..38f5ca158463 100644 --- a/compiler-rt/test/sanitizer_common/lit.site.cfg.in +++ b/compiler-rt/test/sanitizer_common/lit.site.cfg.py.in @@ -10,5 +10,5 @@ config.target_arch = "@SANITIZER_COMMON_TEST_TARGET_ARCH@" lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") # Load tool-specific config that would do the real work. -lit_config.load_config(config, "@SANITIZER_COMMON_LIT_SOURCE_DIR@/lit.common.cfg") +lit_config.load_config(config, "@SANITIZER_COMMON_LIT_SOURCE_DIR@/lit.common.cfg.py") diff --git a/compiler-rt/test/scudo/CMakeLists.txt b/compiler-rt/test/scudo/CMakeLists.txt index 7e0702e9bf19..3a1982add9c4 100644 --- a/compiler-rt/test/scudo/CMakeLists.txt +++ b/compiler-rt/test/scudo/CMakeLists.txt @@ -9,8 +9,8 @@ if(NOT COMPILER_RT_STANDALONE_BUILD) endif() 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 ) set(SCUDO_TEST_ARCH ${SCUDO_SUPPORTED_ARCH}) @@ -22,8 +22,8 @@ foreach(arch ${SCUDO_TEST_ARCH}) set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}Config) configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg) + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py) list(APPEND SCUDO_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) endforeach() diff --git a/compiler-rt/test/scudo/lit.cfg b/compiler-rt/test/scudo/lit.cfg.py similarity index 100% rename from compiler-rt/test/scudo/lit.cfg rename to compiler-rt/test/scudo/lit.cfg.py diff --git a/compiler-rt/test/scudo/lit.site.cfg.in b/compiler-rt/test/scudo/lit.site.cfg.py.in similarity index 84% rename from compiler-rt/test/scudo/lit.site.cfg.in rename to compiler-rt/test/scudo/lit.site.cfg.py.in index 4299518755e9..37ee77ab9334 100644 --- a/compiler-rt/test/scudo/lit.site.cfg.in +++ b/compiler-rt/test/scudo/lit.site.cfg.py.in @@ -8,4 +8,4 @@ config.target_cflags = "@SCUDO_TEST_TARGET_CFLAGS@" lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") # Load tool-specific config that would do the real work. -lit_config.load_config(config, "@SCUDO_LIT_SOURCE_DIR@/lit.cfg") +lit_config.load_config(config, "@SCUDO_LIT_SOURCE_DIR@/lit.cfg.py") diff --git a/compiler-rt/test/scudo/standalone/CMakeLists.txt b/compiler-rt/test/scudo/standalone/CMakeLists.txt index 9d28d655aab2..a55fc6b5daa5 100644 --- a/compiler-rt/test/scudo/standalone/CMakeLists.txt +++ b/compiler-rt/test/scudo/standalone/CMakeLists.txt @@ -1,7 +1,7 @@ if(COMPILER_RT_INCLUDE_TESTS AND COMPILER_RT_HAS_SCUDO_STANDALONE) 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) list(APPEND SCUDO_STANDALONE_TEST_DEPS ScudoUnitTests) list(APPEND SCUDO_STANDALONE_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/unit) endif() diff --git a/compiler-rt/test/scudo/standalone/unit/lit.site.cfg.in b/compiler-rt/test/scudo/standalone/unit/lit.site.cfg.py.in similarity index 100% rename from compiler-rt/test/scudo/standalone/unit/lit.site.cfg.in rename to compiler-rt/test/scudo/standalone/unit/lit.site.cfg.py.in diff --git a/compiler-rt/test/shadowcallstack/CMakeLists.txt b/compiler-rt/test/shadowcallstack/CMakeLists.txt index ab2b18819d49..0333eb6fd6b7 100644 --- a/compiler-rt/test/shadowcallstack/CMakeLists.txt +++ b/compiler-rt/test/shadowcallstack/CMakeLists.txt @@ -10,8 +10,8 @@ foreach(arch ${SHADOWCALLSTACK_SUPPORTED_ARCH}) get_test_cc_for_arch(${arch} SHADOWSTACK_TEST_TARGET_CC SHADOWSTACK_TEST_TARGET_CFLAGS) configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${arch}/lit.site.cfg) + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${arch}/lit.site.cfg.py) list(APPEND SHADOWCALLSTACK_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${arch}) endforeach() diff --git a/compiler-rt/test/shadowcallstack/lit.cfg b/compiler-rt/test/shadowcallstack/lit.cfg.py similarity index 100% rename from compiler-rt/test/shadowcallstack/lit.cfg rename to compiler-rt/test/shadowcallstack/lit.cfg.py diff --git a/compiler-rt/test/shadowcallstack/lit.site.cfg.in b/compiler-rt/test/shadowcallstack/lit.site.cfg.py.in similarity index 97% rename from compiler-rt/test/shadowcallstack/lit.site.cfg.in rename to compiler-rt/test/shadowcallstack/lit.site.cfg.py.in index aa8913e84cb8..4200caf9381f 100644 --- a/compiler-rt/test/shadowcallstack/lit.site.cfg.in +++ b/compiler-rt/test/shadowcallstack/lit.site.cfg.py.in @@ -9,4 +9,4 @@ config.target_arch = "@SHADOWCALLSTACK_TEST_TARGET_ARCH@" lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") # Load tool-specific config that would do the real work. -lit_config.load_config(config, "@SHADOWCALLSTACK_LIT_SOURCE_DIR@/lit.cfg") +lit_config.load_config(config, "@SHADOWCALLSTACK_LIT_SOURCE_DIR@/lit.cfg.py") diff --git a/compiler-rt/test/tsan/CMakeLists.txt b/compiler-rt/test/tsan/CMakeLists.txt index c62eb1d6b3d3..f21fc2a3beec 100644 --- a/compiler-rt/test/tsan/CMakeLists.txt +++ b/compiler-rt/test/tsan/CMakeLists.txt @@ -38,8 +38,8 @@ foreach(arch ${TSAN_TEST_ARCH}) set(CONFIG_NAME ${ARCH_UPPER_CASE}Config) configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg) + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py) list(APPEND TSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) endforeach() @@ -61,8 +61,8 @@ if(APPLE) string(TOUPPER ${arch} ARCH_UPPER_CASE) set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config") configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py ) add_lit_testsuite(check-tsan-iossim-${arch} "ThreadSanitizer iOS Simulator ${arch} tests" ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ @@ -76,8 +76,8 @@ if(APPLE) string(TOUPPER ${arch} ARCH_UPPER_CASE) set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config") configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py ) add_lit_testsuite(check-tsan-ios-${arch} "ThreadSanitizer iOS Simulator ${arch} tests" ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ @@ -88,8 +88,8 @@ endif() if(COMPILER_RT_INCLUDE_TESTS) 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) list(APPEND TSAN_TEST_DEPS TsanUnitTests) list(APPEND TSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Unit) endif() diff --git a/compiler-rt/test/tsan/Darwin/lit.local.cfg b/compiler-rt/test/tsan/Darwin/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/tsan/Darwin/lit.local.cfg rename to compiler-rt/test/tsan/Darwin/lit.local.cfg.py diff --git a/compiler-rt/test/tsan/Linux/lit.local.cfg b/compiler-rt/test/tsan/Linux/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/tsan/Linux/lit.local.cfg rename to compiler-rt/test/tsan/Linux/lit.local.cfg.py diff --git a/compiler-rt/test/tsan/Unit/lit.site.cfg.in b/compiler-rt/test/tsan/Unit/lit.site.cfg.py.in similarity index 98% rename from compiler-rt/test/tsan/Unit/lit.site.cfg.in rename to compiler-rt/test/tsan/Unit/lit.site.cfg.py.in index 40cf096478f5..b9307b52f9e5 100644 --- a/compiler-rt/test/tsan/Unit/lit.site.cfg.in +++ b/compiler-rt/test/tsan/Unit/lit.site.cfg.py.in @@ -16,7 +16,7 @@ if config.host_os == 'Darwin': config.parallelism_group = config.darwin_sanitizer_parallelism_group_func # On Darwin, we default to ignore_noninstrumented_modules=1, which also - # suppresses some races the tests are supposed to find. See tsan/lit.cfg. + # suppresses some races the tests are supposed to find. See tsan/lit.cfg.py. if 'TSAN_OPTIONS' in config.environment: config.environment['TSAN_OPTIONS'] += ':ignore_noninstrumented_modules=0' else: diff --git a/compiler-rt/test/tsan/libcxx/lit.local.cfg b/compiler-rt/test/tsan/libcxx/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/tsan/libcxx/lit.local.cfg rename to compiler-rt/test/tsan/libcxx/lit.local.cfg.py diff --git a/compiler-rt/test/tsan/libdispatch/lit.local.cfg b/compiler-rt/test/tsan/libdispatch/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/tsan/libdispatch/lit.local.cfg rename to compiler-rt/test/tsan/libdispatch/lit.local.cfg.py diff --git a/compiler-rt/test/tsan/lit.cfg b/compiler-rt/test/tsan/lit.cfg.py similarity index 98% rename from compiler-rt/test/tsan/lit.cfg rename to compiler-rt/test/tsan/lit.cfg.py index 50c8a5eea02d..813544831cab 100644 --- a/compiler-rt/test/tsan/lit.cfg +++ b/compiler-rt/test/tsan/lit.cfg.py @@ -8,7 +8,7 @@ def get_required_attr(config, attr_name): lit_config.fatal( "No attribute %r in test configuration! You may need to run " "tests from your build directory or add this attribute " - "to lit.site.cfg " % attr_name) + "to lit.site.cfg.py " % attr_name) return attr_value # Setup config name. @@ -26,7 +26,7 @@ if config.host_os == 'Darwin': default_tsan_opts += ':abort_on_error=0' # On Darwin, we default to ignore_noninstrumented_modules=1, which also # suppresses some races the tests are supposed to find. Let's run without this - # setting, but turn it back on for Darwin tests (see Darwin/lit.local.cfg). + # setting, but turn it back on for Darwin tests (see Darwin/lit.local.cfg.py). default_tsan_opts += ':ignore_noninstrumented_modules=0' # Platform-specific default TSAN_OPTIONS for lit tests. diff --git a/compiler-rt/test/tsan/lit.site.cfg.in b/compiler-rt/test/tsan/lit.site.cfg.py.in similarity index 98% rename from compiler-rt/test/tsan/lit.site.cfg.in rename to compiler-rt/test/tsan/lit.site.cfg.py.in index 6dec5f92b271..a85025980c2b 100644 --- a/compiler-rt/test/tsan/lit.site.cfg.in +++ b/compiler-rt/test/tsan/lit.site.cfg.py.in @@ -11,4 +11,4 @@ config.target_arch = "@TSAN_TEST_TARGET_ARCH@" lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") # Load tool-specific config that would do the real work. -lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg") +lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg.py") diff --git a/compiler-rt/test/ubsan/CMakeLists.txt b/compiler-rt/test/ubsan/CMakeLists.txt index 60ef84d7530f..2d44e64113a2 100644 --- a/compiler-rt/test/ubsan/CMakeLists.txt +++ b/compiler-rt/test/ubsan/CMakeLists.txt @@ -18,8 +18,8 @@ macro(add_ubsan_testsuite test_mode sanitizer arch lld thinlto) set(UBSAN_TEST_USE_THINLTO ${thinlto}) set(CONFIG_NAME ${CONFIG_NAME}-${arch}) configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg) + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py) list(APPEND UBSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) if(NOT COMPILER_RT_STANDALONE_BUILD) list(APPEND UBSAN_TEST_DEPS ${sanitizer}) @@ -75,8 +75,8 @@ macro(add_ubsan_device_testsuite test_mode sanitizer platform arch) unset(UBSAN_TEST_APPLE_PLATFORM) endif() configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg) + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py) #list(APPEND UBSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) if(NOT COMPILER_RT_STANDALONE_BUILD) list(APPEND UBSAN_TEST_DEPS ${sanitizer}) diff --git a/compiler-rt/test/ubsan/TestCases/Misc/Linux/lit.local.cfg b/compiler-rt/test/ubsan/TestCases/Misc/Linux/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/ubsan/TestCases/Misc/Linux/lit.local.cfg rename to compiler-rt/test/ubsan/TestCases/Misc/Linux/lit.local.cfg.py diff --git a/compiler-rt/test/ubsan/TestCases/TypeCheck/Function/lit.local.cfg b/compiler-rt/test/ubsan/TestCases/TypeCheck/Function/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/ubsan/TestCases/TypeCheck/Function/lit.local.cfg rename to compiler-rt/test/ubsan/TestCases/TypeCheck/Function/lit.local.cfg.py diff --git a/compiler-rt/test/ubsan/TestCases/TypeCheck/Linux/lit.local.cfg b/compiler-rt/test/ubsan/TestCases/TypeCheck/Linux/lit.local.cfg.py similarity index 100% rename from compiler-rt/test/ubsan/TestCases/TypeCheck/Linux/lit.local.cfg rename to compiler-rt/test/ubsan/TestCases/TypeCheck/Linux/lit.local.cfg.py diff --git a/compiler-rt/test/ubsan/lit.common.cfg b/compiler-rt/test/ubsan/lit.common.cfg.py similarity index 98% rename from compiler-rt/test/ubsan/lit.common.cfg rename to compiler-rt/test/ubsan/lit.common.cfg.py index f82afe861ebc..bff363351217 100644 --- a/compiler-rt/test/ubsan/lit.common.cfg +++ b/compiler-rt/test/ubsan/lit.common.cfg.py @@ -8,7 +8,7 @@ def get_required_attr(config, attr_name): lit_config.fatal( "No attribute %r in test configuration! You may need to run " "tests from your build directory or add this attribute " - "to lit.site.cfg " % attr_name) + "to lit.site.cfg.py " % attr_name) return attr_value # Setup config name. diff --git a/compiler-rt/test/ubsan/lit.site.cfg.in b/compiler-rt/test/ubsan/lit.site.cfg.py.in similarity index 98% rename from compiler-rt/test/ubsan/lit.site.cfg.in rename to compiler-rt/test/ubsan/lit.site.cfg.py.in index 60c9c84e3c10..6a29917b86ee 100644 --- a/compiler-rt/test/ubsan/lit.site.cfg.in +++ b/compiler-rt/test/ubsan/lit.site.cfg.py.in @@ -13,4 +13,4 @@ config.apple_platform = "@UBSAN_TEST_APPLE_PLATFORM@" lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") # Load tool-specific config that would do the real work. -lit_config.load_config(config, "@UBSAN_LIT_TESTS_DIR@/lit.common.cfg") +lit_config.load_config(config, "@UBSAN_LIT_TESTS_DIR@/lit.common.cfg.py") diff --git a/compiler-rt/test/ubsan_minimal/CMakeLists.txt b/compiler-rt/test/ubsan_minimal/CMakeLists.txt index 5da5fcd02b94..3bc8b19526ef 100644 --- a/compiler-rt/test/ubsan_minimal/CMakeLists.txt +++ b/compiler-rt/test/ubsan_minimal/CMakeLists.txt @@ -18,8 +18,8 @@ foreach(arch ${UBSAN_TEST_ARCH}) get_test_cc_for_arch(${arch} UBSAN_TEST_TARGET_CC UBSAN_TEST_TARGET_CFLAGS) set(CONFIG_NAME ${arch}) configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg) + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py) list(APPEND UBSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) endforeach() diff --git a/compiler-rt/test/ubsan_minimal/lit.common.cfg b/compiler-rt/test/ubsan_minimal/lit.common.cfg.py similarity index 97% rename from compiler-rt/test/ubsan_minimal/lit.common.cfg rename to compiler-rt/test/ubsan_minimal/lit.common.cfg.py index a436a315f0a6..b9106d7ece72 100644 --- a/compiler-rt/test/ubsan_minimal/lit.common.cfg +++ b/compiler-rt/test/ubsan_minimal/lit.common.cfg.py @@ -8,7 +8,7 @@ def get_required_attr(config, attr_name): lit_config.fatal( "No attribute %r in test configuration! You may need to run " "tests from your build directory or add this attribute " - "to lit.site.cfg " % attr_name) + "to lit.site.cfg.py " % attr_name) return attr_value # Setup source root. diff --git a/compiler-rt/test/ubsan_minimal/lit.site.cfg.in b/compiler-rt/test/ubsan_minimal/lit.site.cfg.py.in similarity index 97% rename from compiler-rt/test/ubsan_minimal/lit.site.cfg.in rename to compiler-rt/test/ubsan_minimal/lit.site.cfg.py.in index d4dd68ef2135..10018e9c8435 100644 --- a/compiler-rt/test/ubsan_minimal/lit.site.cfg.in +++ b/compiler-rt/test/ubsan_minimal/lit.site.cfg.py.in @@ -8,4 +8,4 @@ config.target_arch = "@UBSAN_TEST_TARGET_ARCH@" lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") # Load tool-specific config that would do the real work. -lit_config.load_config(config, "@UBSAN_LIT_TESTS_DIR@/lit.common.cfg") +lit_config.load_config(config, "@UBSAN_LIT_TESTS_DIR@/lit.common.cfg.py") diff --git a/compiler-rt/test/xray/CMakeLists.txt b/compiler-rt/test/xray/CMakeLists.txt index d049ac0f979f..b44e82462257 100644 --- a/compiler-rt/test/xray/CMakeLists.txt +++ b/compiler-rt/test/xray/CMakeLists.txt @@ -21,8 +21,8 @@ if (COMPILER_RT_BUILD_XRAY AND COMPILER_RT_HAS_XRAY) set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}Config) configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg) + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in + ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py) list(APPEND XRAY_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) endforeach() @@ -30,8 +30,8 @@ if (COMPILER_RT_BUILD_XRAY AND COMPILER_RT_HAS_XRAY) if(COMPILER_RT_INCLUDE_TESTS) if(UNIX AND NOT APPLE) 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) list(APPEND XRAY_TEST_DEPS XRayUnitTests) list(APPEND XRAY_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Unit) endif() diff --git a/compiler-rt/test/xray/Unit/lit.site.cfg.in b/compiler-rt/test/xray/Unit/lit.site.cfg.py.in similarity index 100% rename from compiler-rt/test/xray/Unit/lit.site.cfg.in rename to compiler-rt/test/xray/Unit/lit.site.cfg.py.in diff --git a/compiler-rt/test/xray/lit.cfg b/compiler-rt/test/xray/lit.cfg.py similarity index 100% rename from compiler-rt/test/xray/lit.cfg rename to compiler-rt/test/xray/lit.cfg.py diff --git a/compiler-rt/test/xray/lit.site.cfg.in b/compiler-rt/test/xray/lit.site.cfg.py.in similarity index 99% rename from compiler-rt/test/xray/lit.site.cfg.in rename to compiler-rt/test/xray/lit.site.cfg.py.in index bc4acb6d3b85..72a7be6a80e3 100644 --- a/compiler-rt/test/xray/lit.site.cfg.in +++ b/compiler-rt/test/xray/lit.site.cfg.py.in @@ -17,4 +17,4 @@ if config.built_with_llvm: lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") # Load tool-specific config that would do the real work. -lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg") +lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg.py") diff --git a/compiler-rt/unittests/lit.common.unit.cfg b/compiler-rt/unittests/lit.common.unit.cfg.py similarity index 100% rename from compiler-rt/unittests/lit.common.unit.cfg rename to compiler-rt/unittests/lit.common.unit.cfg.py diff --git a/compiler-rt/unittests/lit.common.unit.configured.in b/compiler-rt/unittests/lit.common.unit.configured.in index 9f6fadaffc6b..55c6b3416603 100644 --- a/compiler-rt/unittests/lit.common.unit.configured.in +++ b/compiler-rt/unittests/lit.common.unit.configured.in @@ -23,4 +23,4 @@ except KeyError as e: lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key)) # Setup attributes common for all compiler-rt unit tests. -lit_config.load_config(config, "@COMPILER_RT_SOURCE_DIR@/unittests/lit.common.unit.cfg") +lit_config.load_config(config, "@COMPILER_RT_SOURCE_DIR@/unittests/lit.common.unit.cfg.py") diff --git a/compiler-rt/unittests/lit_unittest_cfg_utils.py b/compiler-rt/unittests/lit_unittest_cfg_utils.py index 721e81b9d600..16281f0b48e1 100644 --- a/compiler-rt/unittests/lit_unittest_cfg_utils.py +++ b/compiler-rt/unittests/lit_unittest_cfg_utils.py @@ -1,4 +1,4 @@ # Put all 64-bit tests in the shadow-memory parallelism group. We throttle those -# in our common lit config (lit.common.unit.cfg). +# in our common lit config (lit.common.unit.cfg.py). def darwin_sanitizer_parallelism_group_func(test): return "shadow-memory" if "x86_64" in test.file_path else None diff --git a/llvm/utils/gn/secondary/compiler-rt/test/hwasan/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/test/hwasan/BUILD.gn index f98622dd1544..37ad25ff4284 100644 --- a/llvm/utils/gn/secondary/compiler-rt/test/hwasan/BUILD.gn +++ b/llvm/utils/gn/secondary/compiler-rt/test/hwasan/BUILD.gn @@ -5,8 +5,8 @@ import("//llvm/utils/gn/build/write_cmake_config.gni") import("//llvm/version.gni") write_cmake_config("lit_site_cfg") { - input = "lit.site.cfg.in" - output = "$target_gen_dir/lit.site.cfg" + input = "lit.site.cfg.py.in" + output = "$target_gen_dir/lit.site.cfg.py" values = [ "LIT_SITE_CFG_IN_HEADER=## Autogenerated from $input, do not edit",