Index: clang-tools-extra/clangd/test/CMakeLists.txt
===================================================================
--- clang-tools-extra/clangd/test/CMakeLists.txt
+++ clang-tools-extra/clangd/test/CMakeLists.txt
@@ -35,5 +35,8 @@
   )
 
 add_lit_testsuite(check-clangd "Running the Clangd regression tests"
+  # clangd doesn't put unittest configs in test/unit like every other project.
+  # Because of that, this needs to pass two folders here, while every other
+  # project only needs to pass CMAKE_CURRENT_BINARY_DIR.
   ${CMAKE_CURRENT_BINARY_DIR}/../unittests;${CMAKE_CURRENT_BINARY_DIR}
   DEPENDS ${CLANGD_TEST_DEPS})
Index: clang/test/CMakeLists.txt
===================================================================
--- clang/test/CMakeLists.txt
+++ clang/test/CMakeLists.txt
@@ -106,16 +106,9 @@
 endif ()
 
 set(CLANG_TEST_PARAMS
-  clang_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
   USE_Z3_SOLVER=0
   )
 
-set(ANALYZER_TEST_PARAMS
-  USE_Z3_SOLVER=0)
-
-set(ANALYZER_TEST_PARAMS_Z3
-  USE_Z3_SOLVER=1)
-
 if( NOT CLANG_BUILT_STANDALONE )
   list(APPEND CLANG_TEST_DEPS
     llvm-config
Index: lld/test/CMakeLists.txt
===================================================================
--- lld/test/CMakeLists.txt
+++ lld/test/CMakeLists.txt
@@ -44,14 +44,8 @@
   list(APPEND LLD_TEST_DEPS LLDUnitTests)
 endif()
 
-set(LLD_TEST_PARAMS
-  lld_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
-  )
-
 add_lit_testsuite(check-lld "Running lld test suite"
   ${CMAKE_CURRENT_BINARY_DIR}
-  PARAMS lld_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
-       lld_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
   DEPENDS ${LLD_TEST_DEPS}
   )
 
@@ -59,8 +53,6 @@
 set_target_properties(lld-test-depends PROPERTIES FOLDER "lld tests")
 
 add_lit_testsuites(LLD ${CMAKE_CURRENT_SOURCE_DIR}
-  PARAMS lld_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
-       lld_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
   DEPENDS ${LLD_TEST_DEPS}
   )
 
Index: llvm/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn
+++ llvm/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn
@@ -21,8 +21,9 @@
   output = clangd_lit_site_cfg_file
 
   extra_values = [
-    "CMAKE_CURRENT_BINARY_DIR=" + rebase_path(
-            get_label_info("//clang-tools-extra/clangd/test", "target_out_dir")),
+    "CMAKE_CURRENT_BINARY_DIR=" +
+        rebase_path(get_label_info("//clang-tools-extra/clangd/test",
+                                   "target_out_dir")),
     "CMAKE_CURRENT_SOURCE_DIR=" +
         rebase_path("//clang-tools-extra/clangd/test"),
 
@@ -91,6 +92,10 @@
   }
   args = [
     "-sv",
+
+    # clangd doesn't put unittest configs in test/unit like every other project.
+    # Because of that, this needs to pass two folders here, while every other
+    # project only needs to pass CMAKE_CURRENT_BINARY_DIR.
     rebase_path(get_path_info(clangd_lit_site_cfg_file, "dir"), root_out_dir),
     rebase_path(get_path_info(clangd_lit_unit_site_cfg_file, "dir"),
                 root_out_dir),
Index: llvm/utils/gn/secondary/clang-tools-extra/test/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/clang-tools-extra/test/BUILD.gn
+++ llvm/utils/gn/secondary/clang-tools-extra/test/BUILD.gn
@@ -90,12 +90,6 @@
   }
   args = [
     "-sv",
-    "--param",
-    "clang_site_config=" +
-        rebase_path(clang_tools_extra_lit_site_cfg_file, root_out_dir),
-    "--param",
-    "clang_unit_site_config=" +
-        rebase_path(clang_tools_extra_lit_unit_site_cfg_file, root_out_dir),
     rebase_path(".", root_out_dir),
   ]
   outputs = [ "$target_gen_dir/run-lit" ]  # Non-existing, so that ninja runs it
Index: llvm/utils/gn/secondary/clang/test/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/clang/test/BUILD.gn
+++ llvm/utils/gn/secondary/clang/test/BUILD.gn
@@ -189,11 +189,6 @@
   }
   args = [
     "-sv",
-    "--param",
-    "clang_site_config=" + rebase_path(clang_lit_site_cfg_file, root_out_dir),
-    "--param",
-    "clang_unit_site_config=" +
-        rebase_path(clang_lit_unit_site_cfg_file, root_out_dir),
     rebase_path(".", root_out_dir),
   ]
   outputs = [ "$target_gen_dir/run-lit" ]  # Non-existing, so that ninja runs it
Index: llvm/utils/gn/secondary/lld/test/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/lld/test/BUILD.gn
+++ llvm/utils/gn/secondary/lld/test/BUILD.gn
@@ -110,11 +110,6 @@
   }
   args = [
     "-sv",
-    "--param",
-    "lld_site_config=" + rebase_path(lld_lit_site_cfg_file, root_out_dir),
-    "--param",
-    "lld_unit_site_config=" +
-        rebase_path(lld_lit_unit_site_cfg_file, root_out_dir),
     rebase_path(".", root_out_dir),
   ]
   outputs = [ "$target_gen_dir/run-lit" ]  # Non-existing, so that ninja runs it
Index: llvm/utils/gn/secondary/llvm/test/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/llvm/test/BUILD.gn
+++ llvm/utils/gn/secondary/llvm/test/BUILD.gn
@@ -289,11 +289,6 @@
   }
   args = [
     "-sv",
-    "--param",
-    "llvm_site_config=" + rebase_path(llvm_lit_site_cfg_file, root_out_dir),
-    "--param",
-    "llvm_unit_site_config=" +
-        rebase_path(llvm_lit_unit_site_cfg_file, root_out_dir),
     rebase_path(".", root_out_dir),
   ]
   outputs = [ "$target_gen_dir/run-lit" ]  # Non-existing, so that ninja runs it