[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

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@364591 91177308-0d34-0410-b5e6-96231b3b80d8

102 files changed, 113 insertions, 113 deletions

diff --git a/test/asan/CMakeLists.txt b/test/asan/CMakeLists.txt
index 2a44aebd5..c5ae2870b 100644
--- a/test/asan/CMakeLists.txt
+++ b/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/test/asan/TestCases/Android/lit.local.cfg b/test/asan/TestCases/Android/lit.local.cfg.py
index 63a6e5282..63a6e5282 100644
--- a/test/asan/TestCases/Android/lit.local.cfg
+++ b/test/asan/TestCases/Android/lit.local.cfg.py
diff --git a/test/asan/TestCases/Darwin/lit.local.cfg b/test/asan/TestCases/Darwin/lit.local.cfg.py
index a85dfcd24..a85dfcd24 100644
--- a/test/asan/TestCases/Darwin/lit.local.cfg
+++ b/test/asan/TestCases/Darwin/lit.local.cfg.py
diff --git a/test/asan/TestCases/Helpers/lit.local.cfg b/test/asan/TestCases/Helpers/lit.local.cfg.py
index 2fc4d9945..2fc4d9945 100644
--- a/test/asan/TestCases/Helpers/lit.local.cfg
+++ b/test/asan/TestCases/Helpers/lit.local.cfg.py
diff --git a/test/asan/TestCases/Linux/lit.local.cfg b/test/asan/TestCases/Linux/lit.local.cfg.py
index 57271b807..57271b807 100644
--- a/test/asan/TestCases/Linux/lit.local.cfg
+++ b/test/asan/TestCases/Linux/lit.local.cfg.py
diff --git a/test/asan/TestCases/Posix/lit.local.cfg b/test/asan/TestCases/Posix/lit.local.cfg.py
index 60a946082..60a946082 100644
--- a/test/asan/TestCases/Posix/lit.local.cfg
+++ b/test/asan/TestCases/Posix/lit.local.cfg.py
diff --git a/test/asan/TestCases/Windows/lit.local.cfg b/test/asan/TestCases/Windows/lit.local.cfg.py
index 13ef6d428..13ef6d428 100644
--- a/test/asan/TestCases/Windows/lit.local.cfg
+++ b/test/asan/TestCases/Windows/lit.local.cfg.py
diff --git a/test/asan/Unit/lit.site.cfg.in b/test/asan/Unit/lit.site.cfg.py.in
index 1c59a6bad..1c59a6bad 100644
--- a/test/asan/Unit/lit.site.cfg.in
+++ b/test/asan/Unit/lit.site.cfg.py.in
diff --git a/test/asan/lit.cfg b/test/asan/lit.cfg.py
index 132623f5e..e94a65304 100644
--- a/test/asan/lit.cfg
+++ b/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/test/asan/lit.site.cfg.in b/test/asan/lit.site.cfg.py.in
index 6282fd881..f76b306f8 100644
--- a/test/asan/lit.site.cfg.in
+++ b/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/test/builtins/CMakeLists.txt b/test/builtins/CMakeLists.txt
index eb4391fca..43b7e295a 100644
--- a/test/builtins/CMakeLists.txt
+++ b/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/test/builtins/TestCases/Darwin/lit.local.cfg b/test/builtins/TestCases/Darwin/lit.local.cfg.py
index a85dfcd24..a85dfcd24 100644
--- a/test/builtins/TestCases/Darwin/lit.local.cfg
+++ b/test/builtins/TestCases/Darwin/lit.local.cfg.py
diff --git a/test/builtins/Unit/lit.cfg b/test/builtins/Unit/lit.cfg.py
index d5fa73b0c..3d7e8bf9c 100644
--- a/test/builtins/Unit/lit.cfg
+++ b/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/test/builtins/Unit/lit.site.cfg.in b/test/builtins/Unit/lit.site.cfg.py.in
index 75d70f703..10af44313 100644
--- a/test/builtins/Unit/lit.site.cfg.in
+++ b/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/test/builtins/lit.cfg b/test/builtins/lit.cfg.py
index 0044df7ba..0044df7ba 100644
--- a/test/builtins/lit.cfg
+++ b/test/builtins/lit.cfg.py
diff --git a/test/builtins/lit.site.cfg.in b/test/builtins/lit.site.cfg.py.in
index c7fe82f94..cbd28938d 100644
--- a/test/builtins/lit.site.cfg.in
+++ b/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/test/cfi/CMakeLists.txt b/test/cfi/CMakeLists.txt
index d99213632..9b6ef0f67 100644
--- a/test/cfi/CMakeLists.txt
+++ b/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/test/cfi/cross-dso/icall/lit.local.cfg b/test/cfi/cross-dso/icall/lit.local.cfg.py
index db08765a2..db08765a2 100644
--- a/test/cfi/cross-dso/icall/lit.local.cfg
+++ b/test/cfi/cross-dso/icall/lit.local.cfg.py
diff --git a/test/cfi/cross-dso/lit.local.cfg b/test/cfi/cross-dso/lit.local.cfg.py
index 245d434fa..245d434fa 100644
--- a/test/cfi/cross-dso/lit.local.cfg
+++ b/test/cfi/cross-dso/lit.local.cfg.py
diff --git a/test/cfi/icall/lit.local.cfg b/test/cfi/icall/lit.local.cfg.py
index db08765a2..db08765a2 100644
--- a/test/cfi/icall/lit.local.cfg
+++ b/test/cfi/icall/lit.local.cfg.py
diff --git a/test/cfi/lit.cfg b/test/cfi/lit.cfg.py
index cbffe6ea8..cbffe6ea8 100644
--- a/test/cfi/lit.cfg
+++ b/test/cfi/lit.cfg.py
diff --git a/test/cfi/lit.site.cfg.in b/test/cfi/lit.site.cfg.py.in
index a735e8812..7e150f3a5 100644
--- a/test/cfi/lit.site.cfg.in
+++ b/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/test/crt/CMakeLists.txt b/test/crt/CMakeLists.txt
index 253b76a8c..4026b0f37 100644
--- a/test/crt/CMakeLists.txt
+++ b/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/test/crt/lit.cfg b/test/crt/lit.cfg.py
index eaf00217e..eaf00217e 100644
--- a/test/crt/lit.cfg
+++ b/test/crt/lit.cfg.py
diff --git a/test/crt/lit.site.cfg.in b/test/crt/lit.site.cfg.py.in
index a9a0ce0f3..53eda0c45 100644
--- a/test/crt/lit.site.cfg.in
+++ b/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/test/dfsan/CMakeLists.txt b/test/dfsan/CMakeLists.txt
index 04035faed..168f04623 100644
--- a/test/dfsan/CMakeLists.txt
+++ b/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/test/dfsan/lit.cfg b/test/dfsan/lit.cfg.py
index 6dc0f9c45..6dc0f9c45 100644
--- a/test/dfsan/lit.cfg
+++ b/test/dfsan/lit.cfg.py
diff --git a/test/dfsan/lit.site.cfg.in b/test/dfsan/lit.site.cfg.py.in
index 927ba1141..bfa09c07d 100644
--- a/test/dfsan/lit.site.cfg.in
+++ b/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/test/fuzzer/CMakeLists.txt b/test/fuzzer/CMakeLists.txt
index 8e9f12dd1..62161d001 100644
--- a/test/fuzzer/CMakeLists.txt
+++ b/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/test/fuzzer/lit.cfg b/test/fuzzer/lit.cfg.py
index a4d0bc08f..a4d0bc08f 100644
--- a/test/fuzzer/lit.cfg
+++ b/test/fuzzer/lit.cfg.py
diff --git a/test/fuzzer/lit.site.cfg.in b/test/fuzzer/lit.site.cfg.py.in
index e48be2f4c..cc6a0908d 100644
--- a/test/fuzzer/lit.site.cfg.in
+++ b/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/test/fuzzer/unit/lit.site.cfg.in b/test/fuzzer/unit/lit.site.cfg.py.in
index bab2824e4..bab2824e4 100644
--- a/test/fuzzer/unit/lit.site.cfg.in
+++ b/test/fuzzer/unit/lit.site.cfg.py.in
diff --git a/test/gwp_asan/CMakeLists.txt b/test/gwp_asan/CMakeLists.txt
index 06fc86756..95796521f 100644
--- a/test/gwp_asan/CMakeLists.txt
+++ b/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/test/gwp_asan/lit.cfg b/test/gwp_asan/lit.cfg.py
index c568bf645..c568bf645 100644
--- a/test/gwp_asan/lit.cfg
+++ b/test/gwp_asan/lit.cfg.py
diff --git a/test/gwp_asan/lit.site.cfg.in b/test/gwp_asan/lit.site.cfg.py.in
index 1fb1c1955..5bb57b56e 100644
--- a/test/gwp_asan/lit.site.cfg.in
+++ b/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/test/gwp_asan/unit/lit.site.cfg.in b/test/gwp_asan/unit/lit.site.cfg.py.in
index 9378004b8..9378004b8 100644
--- a/test/gwp_asan/unit/lit.site.cfg.in
+++ b/test/gwp_asan/unit/lit.site.cfg.py.in
diff --git a/test/hwasan/CMakeLists.txt b/test/hwasan/CMakeLists.txt
index 3e397ac06..632309ae7 100644
--- a/test/hwasan/CMakeLists.txt
+++ b/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/test/hwasan/TestCases/Linux/lit.local.cfg b/test/hwasan/TestCases/Linux/lit.local.cfg.py
index 57271b807..57271b807 100644
--- a/test/hwasan/TestCases/Linux/lit.local.cfg
+++ b/test/hwasan/TestCases/Linux/lit.local.cfg.py
diff --git a/test/hwasan/TestCases/Posix/lit.local.cfg b/test/hwasan/TestCases/Posix/lit.local.cfg.py
index 60a946082..60a946082 100644
--- a/test/hwasan/TestCases/Posix/lit.local.cfg
+++ b/test/hwasan/TestCases/Posix/lit.local.cfg.py
diff --git a/test/hwasan/lit.cfg b/test/hwasan/lit.cfg.py
index b9f982081..b9f982081 100644
--- a/test/hwasan/lit.cfg
+++ b/test/hwasan/lit.cfg.py
diff --git a/test/hwasan/lit.site.cfg.in b/test/hwasan/lit.site.cfg.py.in
index e95ea92cd..8b6abd8f2 100644
--- a/test/hwasan/lit.site.cfg.in
+++ b/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/test/interception/CMakeLists.txt b/test/interception/CMakeLists.txt
index ff9e4b0ad..b8e2faa59 100644
--- a/test/interception/CMakeLists.txt
+++ b/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/test/interception/Unit/lit.site.cfg.in b/test/interception/Unit/lit.site.cfg.py.in
index 5d3e2f94f..5d3e2f94f 100644
--- a/test/interception/Unit/lit.site.cfg.in
+++ b/test/interception/Unit/lit.site.cfg.py.in
diff --git a/test/lit.common.cfg b/test/lit.common.cfg.py
index c41f64a44..af0721ad1 100644
--- a/test/lit.common.cfg
+++ b/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/test/lit.common.configured.in b/test/lit.common.configured.in
index 21eb9f80c..5ca95efd5 100644
--- a/test/lit.common.configured.in
+++ b/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/test/lsan/CMakeLists.txt b/test/lsan/CMakeLists.txt
index 3324928dd..b3099956d 100644
--- a/test/lsan/CMakeLists.txt
+++ b/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/test/lsan/TestCases/Darwin/lit.local.cfg b/test/lsan/TestCases/Darwin/lit.local.cfg.py
index a85dfcd24..a85dfcd24 100644
--- a/test/lsan/TestCases/Darwin/lit.local.cfg
+++ b/test/lsan/TestCases/Darwin/lit.local.cfg.py
diff --git a/test/lsan/TestCases/Linux/lit.local.cfg b/test/lsan/TestCases/Linux/lit.local.cfg.py
index 57271b807..57271b807 100644
--- a/test/lsan/TestCases/Linux/lit.local.cfg
+++ b/test/lsan/TestCases/Linux/lit.local.cfg.py
diff --git a/test/lsan/TestCases/Posix/lit.local.cfg b/test/lsan/TestCases/Posix/lit.local.cfg.py
index 60a946082..60a946082 100644
--- a/test/lsan/TestCases/Posix/lit.local.cfg
+++ b/test/lsan/TestCases/Posix/lit.local.cfg.py
diff --git a/test/lsan/lit.common.cfg b/test/lsan/lit.common.cfg.py
index a5df951e2..7548b10c2 100644
--- a/test/lsan/lit.common.cfg
+++ b/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/test/lsan/lit.site.cfg.in b/test/lsan/lit.site.cfg.py.in
index de893474d..bef4d42d2 100644
--- a/test/lsan/lit.site.cfg.in
+++ b/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/test/msan/CMakeLists.txt b/test/msan/CMakeLists.txt
index c6408c1ed..539f2d156 100644
--- a/test/msan/CMakeLists.txt
+++ b/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/test/msan/Linux/lit.local.cfg b/test/msan/Linux/lit.local.cfg.py
index 57271b807..57271b807 100644
--- a/test/msan/Linux/lit.local.cfg
+++ b/test/msan/Linux/lit.local.cfg.py
diff --git a/test/msan/Unit/lit.site.cfg.in b/test/msan/Unit/lit.site.cfg.py.in
index 083a25bc8..083a25bc8 100644
--- a/test/msan/Unit/lit.site.cfg.in
+++ b/test/msan/Unit/lit.site.cfg.py.in
diff --git a/test/msan/lit.cfg b/test/msan/lit.cfg.py
index e08673d5c..e08673d5c 100644
--- a/test/msan/lit.cfg
+++ b/test/msan/lit.cfg.py
diff --git a/test/msan/lit.site.cfg.in b/test/msan/lit.site.cfg.py.in
index f744d71fd..47264d098 100644
--- a/test/msan/lit.site.cfg.in
+++ b/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/test/profile/CMakeLists.txt b/test/profile/CMakeLists.txt
index 5a4cfa101..4b0313065 100644
--- a/test/profile/CMakeLists.txt
+++ b/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/test/profile/Linux/lit.local.cfg b/test/profile/Linux/lit.local.cfg.py
index 98d79518b..98d79518b 100644
--- a/test/profile/Linux/lit.local.cfg
+++ b/test/profile/Linux/lit.local.cfg.py
diff --git a/test/profile/Posix/lit.local.cfg b/test/profile/Posix/lit.local.cfg.py
index 60a946082..60a946082 100644
--- a/test/profile/Posix/lit.local.cfg
+++ b/test/profile/Posix/lit.local.cfg.py
diff --git a/test/profile/lit.cfg b/test/profile/lit.cfg.py
index e59407d72..bda1e28a2 100644
--- a/test/profile/lit.cfg
+++ b/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/test/profile/lit.site.cfg.in b/test/profile/lit.site.cfg.py.in
index 1cb61b51c..bb81fb0c9 100644
--- a/test/profile/lit.site.cfg.in
+++ b/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/test/safestack/CMakeLists.txt b/test/safestack/CMakeLists.txt
index e30a676d7..d1a33b89e 100644
--- a/test/safestack/CMakeLists.txt
+++ b/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/test/safestack/lit.cfg b/test/safestack/lit.cfg.py
index f58ec4553..f58ec4553 100644
--- a/test/safestack/lit.cfg
+++ b/test/safestack/lit.cfg.py
diff --git a/test/safestack/lit.site.cfg.in b/test/safestack/lit.site.cfg.py.in
index 6864f39df..3c8bf41b2 100644
--- a/test/safestack/lit.site.cfg.in
+++ b/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/test/sanitizer_common/CMakeLists.txt b/test/sanitizer_common/CMakeLists.txt
index dd251c6ef..48fccf058 100644
--- a/test/sanitizer_common/CMakeLists.txt
+++ b/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/test/sanitizer_common/TestCases/Darwin/lit.local.cfg b/test/sanitizer_common/TestCases/Darwin/lit.local.cfg.py
index a85dfcd24..a85dfcd24 100644
--- a/test/sanitizer_common/TestCases/Darwin/lit.local.cfg
+++ b/test/sanitizer_common/TestCases/Darwin/lit.local.cfg.py
diff --git a/test/sanitizer_common/TestCases/FreeBSD/lit.local.cfg b/test/sanitizer_common/TestCases/FreeBSD/lit.local.cfg.py
index 6f2f4280f..6f2f4280f 100644
--- a/test/sanitizer_common/TestCases/FreeBSD/lit.local.cfg
+++ b/test/sanitizer_common/TestCases/FreeBSD/lit.local.cfg.py
diff --git a/test/sanitizer_common/TestCases/Linux/lit.local.cfg b/test/sanitizer_common/TestCases/Linux/lit.local.cfg.py
index 57271b807..57271b807 100644
--- a/test/sanitizer_common/TestCases/Linux/lit.local.cfg
+++ b/test/sanitizer_common/TestCases/Linux/lit.local.cfg.py
diff --git a/test/sanitizer_common/TestCases/NetBSD/lit.local.cfg b/test/sanitizer_common/TestCases/NetBSD/lit.local.cfg.py
index 94023561f..94023561f 100644
--- a/test/sanitizer_common/TestCases/NetBSD/lit.local.cfg
+++ b/test/sanitizer_common/TestCases/NetBSD/lit.local.cfg.py
diff --git a/test/sanitizer_common/TestCases/Posix/lit.local.cfg b/test/sanitizer_common/TestCases/Posix/lit.local.cfg.py
index 60a946082..60a946082 100644
--- a/test/sanitizer_common/TestCases/Posix/lit.local.cfg
+++ b/test/sanitizer_common/TestCases/Posix/lit.local.cfg.py
diff --git a/test/sanitizer_common/Unit/lit.site.cfg.in b/test/sanitizer_common/Unit/lit.site.cfg.py.in
index 46855d9e8..46855d9e8 100644
--- a/test/sanitizer_common/Unit/lit.site.cfg.in
+++ b/test/sanitizer_common/Unit/lit.site.cfg.py.in
diff --git a/test/sanitizer_common/lit.common.cfg b/test/sanitizer_common/lit.common.cfg.py
index a9965f070..a9965f070 100644
--- a/test/sanitizer_common/lit.common.cfg
+++ b/test/sanitizer_common/lit.common.cfg.py
diff --git a/test/sanitizer_common/lit.site.cfg.in b/test/sanitizer_common/lit.site.cfg.py.in
index 414eabad1..38f5ca158 100644
--- a/test/sanitizer_common/lit.site.cfg.in
+++ b/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/test/scudo/CMakeLists.txt b/test/scudo/CMakeLists.txt
index 7e0702e9b..3a1982add 100644
--- a/test/scudo/CMakeLists.txt
+++ b/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/test/scudo/lit.cfg b/test/scudo/lit.cfg.py
index ca2c1b970..ca2c1b970 100644
--- a/test/scudo/lit.cfg
+++ b/test/scudo/lit.cfg.py
diff --git a/test/scudo/lit.site.cfg.in b/test/scudo/lit.site.cfg.py.in
index 429951875..37ee77ab9 100644
--- a/test/scudo/lit.site.cfg.in
+++ b/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/test/scudo/standalone/CMakeLists.txt b/test/scudo/standalone/CMakeLists.txt
index 9d28d655a..a55fc6b5d 100644
--- a/test/scudo/standalone/CMakeLists.txt
+++ b/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/test/scudo/standalone/unit/lit.site.cfg.in b/test/scudo/standalone/unit/lit.site.cfg.py.in
index ef34739b8..ef34739b8 100644
--- a/test/scudo/standalone/unit/lit.site.cfg.in
+++ b/test/scudo/standalone/unit/lit.site.cfg.py.in
diff --git a/test/shadowcallstack/CMakeLists.txt b/test/shadowcallstack/CMakeLists.txt
index ab2b18819..0333eb6fd 100644
--- a/test/shadowcallstack/CMakeLists.txt
+++ b/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/test/shadowcallstack/lit.cfg b/test/shadowcallstack/lit.cfg.py
index d04d37831..d04d37831 100644
--- a/test/shadowcallstack/lit.cfg
+++ b/test/shadowcallstack/lit.cfg.py
diff --git a/test/shadowcallstack/lit.site.cfg.in b/test/shadowcallstack/lit.site.cfg.py.in
index aa8913e84..4200caf93 100644
--- a/test/shadowcallstack/lit.site.cfg.in
+++ b/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/test/tsan/CMakeLists.txt b/test/tsan/CMakeLists.txt
index c62eb1d6b..f21fc2a3b 100644
--- a/test/tsan/CMakeLists.txt
+++ b/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/test/tsan/Darwin/lit.local.cfg b/test/tsan/Darwin/lit.local.cfg.py
index e74e82dbf..e74e82dbf 100644
--- a/test/tsan/Darwin/lit.local.cfg
+++ b/test/tsan/Darwin/lit.local.cfg.py
diff --git a/test/tsan/Linux/lit.local.cfg b/test/tsan/Linux/lit.local.cfg.py
index 57271b807..57271b807 100644
--- a/test/tsan/Linux/lit.local.cfg
+++ b/test/tsan/Linux/lit.local.cfg.py
diff --git a/test/tsan/Unit/lit.site.cfg.in b/test/tsan/Unit/lit.site.cfg.py.in
index 40cf09647..b9307b52f 100644
--- a/test/tsan/Unit/lit.site.cfg.in
+++ b/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/test/tsan/libcxx/lit.local.cfg b/test/tsan/libcxx/lit.local.cfg.py
index 3ee705736..3ee705736 100644
--- a/test/tsan/libcxx/lit.local.cfg
+++ b/test/tsan/libcxx/lit.local.cfg.py
diff --git a/test/tsan/libdispatch/lit.local.cfg b/test/tsan/libdispatch/lit.local.cfg.py
index 9d3cf7548..9d3cf7548 100644
--- a/test/tsan/libdispatch/lit.local.cfg
+++ b/test/tsan/libdispatch/lit.local.cfg.py
diff --git a/test/tsan/lit.cfg b/test/tsan/lit.cfg.py
index 50c8a5eea..813544831 100644
--- a/test/tsan/lit.cfg
+++ b/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/test/tsan/lit.site.cfg.in b/test/tsan/lit.site.cfg.py.in
index 6dec5f92b..a85025980 100644
--- a/test/tsan/lit.site.cfg.in
+++ b/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/test/ubsan/CMakeLists.txt b/test/ubsan/CMakeLists.txt
index 60ef84d75..2d44e6411 100644
--- a/test/ubsan/CMakeLists.txt
+++ b/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/test/ubsan/TestCases/Misc/Linux/lit.local.cfg b/test/ubsan/TestCases/Misc/Linux/lit.local.cfg.py
index 57271b807..57271b807 100644
--- a/test/ubsan/TestCases/Misc/Linux/lit.local.cfg
+++ b/test/ubsan/TestCases/Misc/Linux/lit.local.cfg.py
diff --git a/test/ubsan/TestCases/TypeCheck/Function/lit.local.cfg b/test/ubsan/TestCases/TypeCheck/Function/lit.local.cfg.py
index a10159995..a10159995 100644
--- a/test/ubsan/TestCases/TypeCheck/Function/lit.local.cfg
+++ b/test/ubsan/TestCases/TypeCheck/Function/lit.local.cfg.py
diff --git a/test/ubsan/TestCases/TypeCheck/Linux/lit.local.cfg b/test/ubsan/TestCases/TypeCheck/Linux/lit.local.cfg.py
index 57271b807..57271b807 100644
--- a/test/ubsan/TestCases/TypeCheck/Linux/lit.local.cfg
+++ b/test/ubsan/TestCases/TypeCheck/Linux/lit.local.cfg.py
diff --git a/test/ubsan/lit.common.cfg b/test/ubsan/lit.common.cfg.py
index f82afe861..bff363351 100644
--- a/test/ubsan/lit.common.cfg
+++ b/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/test/ubsan/lit.site.cfg.in b/test/ubsan/lit.site.cfg.py.in
index 60c9c84e3..6a29917b8 100644
--- a/test/ubsan/lit.site.cfg.in
+++ b/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/test/ubsan_minimal/CMakeLists.txt b/test/ubsan_minimal/CMakeLists.txt
index 5da5fcd02..3bc8b1952 100644
--- a/test/ubsan_minimal/CMakeLists.txt
+++ b/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/test/ubsan_minimal/lit.common.cfg b/test/ubsan_minimal/lit.common.cfg.py
index a436a315f..b9106d7ec 100644
--- a/test/ubsan_minimal/lit.common.cfg
+++ b/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/test/ubsan_minimal/lit.site.cfg.in b/test/ubsan_minimal/lit.site.cfg.py.in
index d4dd68ef2..10018e9c8 100644
--- a/test/ubsan_minimal/lit.site.cfg.in
+++ b/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/test/xray/CMakeLists.txt b/test/xray/CMakeLists.txt
index d049ac0f9..b44e82462 100644
--- a/test/xray/CMakeLists.txt
+++ b/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/test/xray/Unit/lit.site.cfg.in b/test/xray/Unit/lit.site.cfg.py.in
index 54fcc1cbd..54fcc1cbd 100644
--- a/test/xray/Unit/lit.site.cfg.in
+++ b/test/xray/Unit/lit.site.cfg.py.in
diff --git a/test/xray/lit.cfg b/test/xray/lit.cfg.py
index cc4cc2124..cc4cc2124 100644
--- a/test/xray/lit.cfg
+++ b/test/xray/lit.cfg.py
diff --git a/test/xray/lit.site.cfg.in b/test/xray/lit.site.cfg.py.in
index bc4acb6d3..72a7be6a8 100644
--- a/test/xray/lit.site.cfg.in
+++ b/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")