[clangd] Move clangd tests to clangd directory. check-clangd is no longer part of check-clang-tools.

Summary:
Motivation:
 - this layout is a pain to work with
 - without a common root, it's painful to express things like "disable clangd" (D61122)
 - CMake/lit configs are a maintenance hazard, and the more the one-off hacks
   for various tools are entangled, the more we see apathy and non-ownership.

This attempts to use the bare-minimum configuration needed (while still
supporting the difficult cases: windows, standalone clang build, dynamic libs).
In particular the lit.cfg.py and lit.site.cfg.py.in are merged into lit.cfg.in.
The logic in these files is now minimal.

(Much of clang-tools-extra's lit configs can probably be cleaned up by reusing
lit.llvm.llvm_config.use_clang(), and every llvm project does its own version of
LDPATH mangling. I haven't attempted to fix any of those).

Docs are still in clang-tools-extra/docs, I don't have any plans to touch those.

Reviewers: gribozavr

Subscribers: mgorny, javed.absar, MaskRay, jkorous, arphaman, kadircet, jfb, cfe-commits, ilya-biryukov, thakis

Tags: #clang

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

llvm-svn: 359424

112 files changed, 119 insertions, 58 deletions

diff --git a/clang-tools-extra/CMakeLists.txt b/clang-tools-extra/CMakeLists.txt
index 514b17fb3c0..d32b4b9f9eb 100644
--- a/clang-tools-extra/CMakeLists.txt
+++ b/clang-tools-extra/CMakeLists.txt
@@ -1,15 +1,3 @@
-if (NOT DEFINED CLANGD_BUILD_XPC)
-  if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    set(CLANGD_BUILD_XPC_DEFAULT ON)
-  else ()
-    set(CLANGD_BUILD_XPC_DEFAULT OFF)
-  endif ()
-
-  set(CLANGD_BUILD_XPC ${CLANGD_BUILD_XPC_DEFAULT} CACHE BOOL "Build XPC Support For Clangd." FORCE)
-
-  unset(CLANGD_BUILD_XPC_DEFAULT)
-endif ()
-
 add_subdirectory(clang-apply-replacements)
 add_subdirectory(clang-reorder-fields)
 add_subdirectory(modularize)
diff --git a/clang-tools-extra/clangd/CMakeLists.txt b/clang-tools-extra/clangd/CMakeLists.txt
index 8e159212fa5..d4dd47ebf6f 100644
--- a/clang-tools-extra/clangd/CMakeLists.txt
+++ b/clang-tools-extra/clangd/CMakeLists.txt
@@ -1,6 +1,17 @@
 # Configure the Features.inc file.
-llvm_canonicalize_cmake_booleans(
-  CLANGD_BUILD_XPC)
+if (NOT DEFINED CLANGD_BUILD_XPC)
+  if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    set(CLANGD_BUILD_XPC_DEFAULT ON)
+  else ()
+    set(CLANGD_BUILD_XPC_DEFAULT OFF)
+  endif ()
+
+  set(CLANGD_BUILD_XPC ${CLANGD_BUILD_XPC_DEFAULT} CACHE BOOL "Build XPC Support For Clangd." FORCE)
+  unset(CLANGD_BUILD_XPC_DEFAULT)
+endif ()
+
+llvm_canonicalize_cmake_booleans(CLANGD_BUILD_XPC)
+
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/Features.inc.in
   ${CMAKE_CURRENT_BINARY_DIR}/Features.inc
@@ -130,3 +141,8 @@ endif()
 if ( CLANGD_BUILD_XPC )
   add_subdirectory(xpc)
 endif ()
+
+if(CLANG_INCLUDE_TESTS)
+add_subdirectory(test)
+add_subdirectory(unittests)
+endif()
diff --git a/clang-tools-extra/clangd/test/CMakeLists.txt b/clang-tools-extra/clangd/test/CMakeLists.txt
new file mode 100644
index 00000000000..6de75c01aff
--- /dev/null
+++ b/clang-tools-extra/clangd/test/CMakeLists.txt
@@ -0,0 +1,28 @@
+set(CLANGD_TEST_DEPS
+  clangd
+  ClangdTests
+  # No tests for these, but we should still make sure they build.
+  clangd-indexer
+  dexp
+  )
+
+if(CLANGD_BUILD_XPC)
+  list(APPEND CLANGD_TEST_DEPS clangd-xpc-test-client)
+endif()
+
+foreach(dep FileCheck count not)
+  if(TARGET ${dep})
+    list(APPEND CLANGD_TEST_DEPS ${dep})
+  endif()
+endforeach()
+
+configure_lit_site_cfg(
+  ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.in
+  ${CMAKE_CURRENT_BINARY_DIR}/lit.cfg)
+configure_lit_site_cfg(
+  ${CMAKE_CURRENT_SOURCE_DIR}/../unittests/lit.cfg.in
+  ${CMAKE_CURRENT_BINARY_DIR}/../unittests/lit.cfg)
+
+add_lit_testsuite(check-clangd "Running the Clangd regression tests"
+  ${CMAKE_CURRENT_BINARY_DIR}/Unit;${CMAKE_CURRENT_BINARY_DIR}
+  DEPENDS ${CLANGD_TEST_DEPS})
diff --git a/clang-tools-extra/test/clangd/Inputs/BenchmarkHeader.h b/clang-tools-extra/clangd/test/Inputs/BenchmarkHeader.h
index 3b7620adafb..3b7620adafb 100644
--- a/clang-tools-extra/test/clangd/Inputs/BenchmarkHeader.h
+++ b/clang-tools-extra/clangd/test/Inputs/BenchmarkHeader.h
diff --git a/clang-tools-extra/test/clangd/Inputs/BenchmarkSource.cpp b/clang-tools-extra/clangd/test/Inputs/BenchmarkSource.cpp
index 1924df9a7ba..1924df9a7ba 100644
--- a/clang-tools-extra/test/clangd/Inputs/BenchmarkSource.cpp
+++ b/clang-tools-extra/clangd/test/Inputs/BenchmarkSource.cpp
diff --git a/clang-tools-extra/test/clangd/Inputs/background-index/compile_commands.json b/clang-tools-extra/clangd/test/Inputs/background-index/compile_commands.json
index 1bb835f642d..1bb835f642d 100644
--- a/clang-tools-extra/test/clangd/Inputs/background-index/compile_commands.json
+++ b/clang-tools-extra/clangd/test/Inputs/background-index/compile_commands.json
diff --git a/clang-tools-extra/test/clangd/Inputs/background-index/definition.jsonrpc b/clang-tools-extra/clangd/test/Inputs/background-index/definition.jsonrpc
index 933e7791320..933e7791320 100644
--- a/clang-tools-extra/test/clangd/Inputs/background-index/definition.jsonrpc
+++ b/clang-tools-extra/clangd/test/Inputs/background-index/definition.jsonrpc
diff --git a/clang-tools-extra/test/clangd/Inputs/background-index/foo.cpp b/clang-tools-extra/clangd/test/Inputs/background-index/foo.cpp
index c42ca4d0737..c42ca4d0737 100644
--- a/clang-tools-extra/test/clangd/Inputs/background-index/foo.cpp
+++ b/clang-tools-extra/clangd/test/Inputs/background-index/foo.cpp
diff --git a/clang-tools-extra/test/clangd/Inputs/background-index/foo.h b/clang-tools-extra/clangd/test/Inputs/background-index/foo.h
index 9539f1d7588..9539f1d7588 100644
--- a/clang-tools-extra/test/clangd/Inputs/background-index/foo.h
+++ b/clang-tools-extra/clangd/test/Inputs/background-index/foo.h
diff --git a/clang-tools-extra/test/clangd/Inputs/requests.json b/clang-tools-extra/clangd/test/Inputs/requests.json
index ee91cf24374..ee91cf24374 100644
--- a/clang-tools-extra/test/clangd/Inputs/requests.json
+++ b/clang-tools-extra/clangd/test/Inputs/requests.json
diff --git a/clang-tools-extra/test/clangd/Inputs/symbols.test.yaml b/clang-tools-extra/clangd/test/Inputs/symbols.test.yaml
index 40068e3640a..40068e3640a 100644
--- a/clang-tools-extra/test/clangd/Inputs/symbols.test.yaml
+++ b/clang-tools-extra/clangd/test/Inputs/symbols.test.yaml
diff --git a/clang-tools-extra/test/clangd/background-index.test b/clang-tools-extra/clangd/test/background-index.test
index 1d11736dfe8..1d11736dfe8 100644
--- a/clang-tools-extra/test/clangd/background-index.test
+++ b/clang-tools-extra/clangd/test/background-index.test
diff --git a/clang-tools-extra/test/clangd/compile-commands-path-in-initialize.test b/clang-tools-extra/clangd/test/compile-commands-path-in-initialize.test
index 2905bad49df..2905bad49df 100644
--- a/clang-tools-extra/test/clangd/compile-commands-path-in-initialize.test
+++ b/clang-tools-extra/clangd/test/compile-commands-path-in-initialize.test
diff --git a/clang-tools-extra/test/clangd/completion-auto-trigger.test b/clang-tools-extra/clangd/test/completion-auto-trigger.test
index db3cc537ad2..db3cc537ad2 100644
--- a/clang-tools-extra/test/clangd/completion-auto-trigger.test
+++ b/clang-tools-extra/clangd/test/completion-auto-trigger.test
diff --git a/clang-tools-extra/test/clangd/completion-snippets.test b/clang-tools-extra/clangd/test/completion-snippets.test
index 22cd0821b22..22cd0821b22 100644
--- a/clang-tools-extra/test/clangd/completion-snippets.test
+++ b/clang-tools-extra/clangd/test/completion-snippets.test
diff --git a/clang-tools-extra/test/clangd/completion.test b/clang-tools-extra/clangd/test/completion.test
index 0094d4740b2..0094d4740b2 100644
--- a/clang-tools-extra/test/clangd/completion.test
+++ b/clang-tools-extra/clangd/test/completion.test
diff --git a/clang-tools-extra/test/clangd/crash-non-added-files.test b/clang-tools-extra/clangd/test/crash-non-added-files.test
index d86f7d26d87..d86f7d26d87 100644
--- a/clang-tools-extra/test/clangd/crash-non-added-files.test
+++ b/clang-tools-extra/clangd/test/crash-non-added-files.test
diff --git a/clang-tools-extra/test/clangd/delimited-input-comment-at-the-end.test b/clang-tools-extra/clangd/test/delimited-input-comment-at-the-end.test
index 34a248dfde6..34a248dfde6 100644
--- a/clang-tools-extra/test/clangd/delimited-input-comment-at-the-end.test
+++ b/clang-tools-extra/clangd/test/delimited-input-comment-at-the-end.test
diff --git a/clang-tools-extra/test/clangd/diagnostic-category.test b/clang-tools-extra/clangd/test/diagnostic-category.test
index 39467746c67..39467746c67 100644
--- a/clang-tools-extra/test/clangd/diagnostic-category.test
+++ b/clang-tools-extra/clangd/test/diagnostic-category.test
diff --git a/clang-tools-extra/test/clangd/diagnostics-notes.test b/clang-tools-extra/clangd/test/diagnostics-notes.test
index c04c5cf0da9..c04c5cf0da9 100644
--- a/clang-tools-extra/test/clangd/diagnostics-notes.test
+++ b/clang-tools-extra/clangd/test/diagnostics-notes.test
diff --git a/clang-tools-extra/test/clangd/diagnostics.test b/clang-tools-extra/clangd/test/diagnostics.test
index accfd17e056..accfd17e056 100644
--- a/clang-tools-extra/test/clangd/diagnostics.test
+++ b/clang-tools-extra/clangd/test/diagnostics.test
diff --git a/clang-tools-extra/test/clangd/did-change-configuration-params.test b/clang-tools-extra/clangd/test/did-change-configuration-params.test
index bd8ffafcd59..bd8ffafcd59 100644
--- a/clang-tools-extra/test/clangd/did-change-configuration-params.test
+++ b/clang-tools-extra/clangd/test/did-change-configuration-params.test
diff --git a/clang-tools-extra/test/clangd/execute-command.test b/clang-tools-extra/clangd/test/execute-command.test
index 7abd79e54cb..7abd79e54cb 100644
--- a/clang-tools-extra/test/clangd/execute-command.test
+++ b/clang-tools-extra/clangd/test/execute-command.test
diff --git a/clang-tools-extra/test/clangd/exit-with-shutdown.test b/clang-tools-extra/clangd/test/exit-with-shutdown.test
index 99e412c7b92..99e412c7b92 100644
--- a/clang-tools-extra/test/clangd/exit-with-shutdown.test
+++ b/clang-tools-extra/clangd/test/exit-with-shutdown.test
diff --git a/clang-tools-extra/test/clangd/exit-without-shutdown.test b/clang-tools-extra/clangd/test/exit-without-shutdown.test
index 7b22d0597d6..7b22d0597d6 100644
--- a/clang-tools-extra/test/clangd/exit-without-shutdown.test
+++ b/clang-tools-extra/clangd/test/exit-without-shutdown.test
diff --git a/clang-tools-extra/test/clangd/filestatus.test b/clang-tools-extra/clangd/test/filestatus.test
index c485939b5c5..c485939b5c5 100644
--- a/clang-tools-extra/test/clangd/filestatus.test
+++ b/clang-tools-extra/clangd/test/filestatus.test
diff --git a/clang-tools-extra/test/clangd/fixits-codeaction.test b/clang-tools-extra/clangd/test/fixits-codeaction.test
index e9190711795..e9190711795 100644
--- a/clang-tools-extra/test/clangd/fixits-codeaction.test
+++ b/clang-tools-extra/clangd/test/fixits-codeaction.test
diff --git a/clang-tools-extra/test/clangd/fixits-command.test b/clang-tools-extra/clangd/test/fixits-command.test
index 9d43e701ec0..9d43e701ec0 100644
--- a/clang-tools-extra/test/clangd/fixits-command.test
+++ b/clang-tools-extra/clangd/test/fixits-command.test
diff --git a/clang-tools-extra/test/clangd/fixits-embed-in-diagnostic.test b/clang-tools-extra/clangd/test/fixits-embed-in-diagnostic.test
index 7d2cccdb433..7d2cccdb433 100644
--- a/clang-tools-extra/test/clangd/fixits-embed-in-diagnostic.test
+++ b/clang-tools-extra/clangd/test/fixits-embed-in-diagnostic.test
diff --git a/clang-tools-extra/test/clangd/formatting.test b/clang-tools-extra/clangd/test/formatting.test
index 9f8f3db9a5a..9f8f3db9a5a 100644
--- a/clang-tools-extra/test/clangd/formatting.test
+++ b/clang-tools-extra/clangd/test/formatting.test
diff --git a/clang-tools-extra/test/clangd/hover.test b/clang-tools-extra/clangd/test/hover.test
index 8f1ead05595..8f1ead05595 100644
--- a/clang-tools-extra/test/clangd/hover.test
+++ b/clang-tools-extra/clangd/test/hover.test
diff --git a/clang-tools-extra/test/clangd/index-tools.test b/clang-tools-extra/clangd/test/index-tools.test
index 93cf56fea37..93cf56fea37 100644
--- a/clang-tools-extra/test/clangd/index-tools.test
+++ b/clang-tools-extra/clangd/test/index-tools.test
diff --git a/clang-tools-extra/test/clangd/initialize-params-invalid.test b/clang-tools-extra/clangd/test/initialize-params-invalid.test
index f51a7279ca2..f51a7279ca2 100644
--- a/clang-tools-extra/test/clangd/initialize-params-invalid.test
+++ b/clang-tools-extra/clangd/test/initialize-params-invalid.test
diff --git a/clang-tools-extra/test/clangd/initialize-params.test b/clang-tools-extra/clangd/test/initialize-params.test
index 488539d47f2..488539d47f2 100644
--- a/clang-tools-extra/test/clangd/initialize-params.test
+++ b/clang-tools-extra/clangd/test/initialize-params.test
diff --git a/clang-tools-extra/test/clangd/initialize-sequence.test b/clang-tools-extra/clangd/test/initialize-sequence.test
index d1b82470281..d1b82470281 100644
--- a/clang-tools-extra/test/clangd/initialize-sequence.test
+++ b/clang-tools-extra/clangd/test/initialize-sequence.test
diff --git a/clang-tools-extra/test/clangd/input-mirror.test b/clang-tools-extra/clangd/test/input-mirror.test
index 52845621e9e..52845621e9e 100644
--- a/clang-tools-extra/test/clangd/input-mirror.test
+++ b/clang-tools-extra/clangd/test/input-mirror.test
diff --git a/clang-tools-extra/clangd/test/lit.cfg.in b/clang-tools-extra/clangd/test/lit.cfg.in
new file mode 100644
index 00000000000..8f5a5838578
--- /dev/null
+++ b/clang-tools-extra/clangd/test/lit.cfg.in
@@ -0,0 +1,29 @@
+@LIT_SITE_CFG_IN_HEADER@
+
+import lit.llvm
+import lit.formats
+
+# Reuse clang configuration (PATH setup, etc).
+config.clang_tools_dir = "@CLANG_TOOLS_DIR@"
+config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
+config.clang_libs_dir = "@CLANG_LIBS_DIR@"
+config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
+config.target_triple = "@TARGET_TRIPLE@"
+config.host_triple = "@LLVM_HOST_TRIPLE@"
+lit.llvm.initialize(lit_config, config)
+lit.llvm.llvm_config.use_clang()
+
+config.name = 'Clangd'
+config.suffixes = ['.test']
+config.excludes = ['Inputs']
+config.test_format = lit.formats.ShTest(not lit.llvm.llvm_config.use_lit_shell)
+config.test_source_root = "@CMAKE_CURRENT_SOURCE_DIR@"
+config.test_exec_root = "@CMAKE_CURRENT_BINARY_DIR@"
+
+# Clangd-specific lit environment.
+config.substitutions.append(('%clangd-benchmark-dir',
+                             "@CMAKE_CURRENT_BINARY_DIR@/../benchmarks"))
+
+if @CLANGD_BUILD_XPC@:
+  config.available_features.add('clangd-xpc-support')
+
diff --git a/clang-tools-extra/test/clangd/lit.local.cfg b/clang-tools-extra/clangd/test/lit.local.cfg
index ef338c75537..ef338c75537 100644
--- a/clang-tools-extra/test/clangd/lit.local.cfg
+++ b/clang-tools-extra/clangd/test/lit.local.cfg
diff --git a/clang-tools-extra/test/clangd/protocol.test b/clang-tools-extra/clangd/test/protocol.test
index c218763de20..c218763de20 100644
--- a/clang-tools-extra/test/clangd/protocol.test
+++ b/clang-tools-extra/clangd/test/protocol.test
diff --git a/clang-tools-extra/test/clangd/references.test b/clang-tools-extra/clangd/test/references.test
index 964f5e7f952..964f5e7f952 100644
--- a/clang-tools-extra/test/clangd/references.test
+++ b/clang-tools-extra/clangd/test/references.test
diff --git a/clang-tools-extra/test/clangd/rename.test b/clang-tools-extra/clangd/test/rename.test
index 7c504bd1a87..7c504bd1a87 100644
--- a/clang-tools-extra/test/clangd/rename.test
+++ b/clang-tools-extra/clangd/test/rename.test
diff --git a/clang-tools-extra/test/clangd/signature-help.test b/clang-tools-extra/clangd/test/signature-help.test
index 37b8b500b57..37b8b500b57 100644
--- a/clang-tools-extra/test/clangd/signature-help.test
+++ b/clang-tools-extra/clangd/test/signature-help.test
diff --git a/clang-tools-extra/test/clangd/spaces-in-delimited-input.test b/clang-tools-extra/clangd/test/spaces-in-delimited-input.test
index 9636425ea37..9636425ea37 100644
--- a/clang-tools-extra/test/clangd/spaces-in-delimited-input.test
+++ b/clang-tools-extra/clangd/test/spaces-in-delimited-input.test
diff --git a/clang-tools-extra/test/clangd/symbol-info.test b/clang-tools-extra/clangd/test/symbol-info.test
index 65094a4bd4d..65094a4bd4d 100644
--- a/clang-tools-extra/test/clangd/symbol-info.test
+++ b/clang-tools-extra/clangd/test/symbol-info.test
diff --git a/clang-tools-extra/test/clangd/symbols.test b/clang-tools-extra/clangd/test/symbols.test
index a15d7028b9c..a15d7028b9c 100644
--- a/clang-tools-extra/test/clangd/symbols.test
+++ b/clang-tools-extra/clangd/test/symbols.test
diff --git a/clang-tools-extra/test/clangd/test-uri-posix.test b/clang-tools-extra/clangd/test/test-uri-posix.test
index 2b67fa03e0f..2b67fa03e0f 100644
--- a/clang-tools-extra/test/clangd/test-uri-posix.test
+++ b/clang-tools-extra/clangd/test/test-uri-posix.test
diff --git a/clang-tools-extra/test/clangd/test-uri-windows.test b/clang-tools-extra/clangd/test/test-uri-windows.test
index 381c48fafc0..381c48fafc0 100644
--- a/clang-tools-extra/test/clangd/test-uri-windows.test
+++ b/clang-tools-extra/clangd/test/test-uri-windows.test
diff --git a/clang-tools-extra/test/clangd/textdocument-didchange-fail.test b/clang-tools-extra/clangd/test/textdocument-didchange-fail.test
index 33350c4a3c7..33350c4a3c7 100644
--- a/clang-tools-extra/test/clangd/textdocument-didchange-fail.test
+++ b/clang-tools-extra/clangd/test/textdocument-didchange-fail.test
diff --git a/clang-tools-extra/test/clangd/too_large.test b/clang-tools-extra/clangd/test/too_large.test
index 7b846c37f08..7b846c37f08 100644
--- a/clang-tools-extra/test/clangd/too_large.test
+++ b/clang-tools-extra/clangd/test/too_large.test
diff --git a/clang-tools-extra/test/clangd/trace.test b/clang-tools-extra/clangd/test/trace.test
index cb6a226b496..cb6a226b496 100644
--- a/clang-tools-extra/test/clangd/trace.test
+++ b/clang-tools-extra/clangd/test/trace.test
diff --git a/clang-tools-extra/test/clangd/tweaks-format.test b/clang-tools-extra/clangd/test/tweaks-format.test
index 8fe7a112acf..8fe7a112acf 100644
--- a/clang-tools-extra/test/clangd/tweaks-format.test
+++ b/clang-tools-extra/clangd/test/tweaks-format.test
diff --git a/clang-tools-extra/test/clangd/type-hierarchy.test b/clang-tools-extra/clangd/test/type-hierarchy.test
index 420f7fbfb3e..420f7fbfb3e 100644
--- a/clang-tools-extra/test/clangd/type-hierarchy.test
+++ b/clang-tools-extra/clangd/test/type-hierarchy.test
diff --git a/clang-tools-extra/test/clangd/unsupported-method.test b/clang-tools-extra/clangd/test/unsupported-method.test
index 9cdb12c3d80..9cdb12c3d80 100644
--- a/clang-tools-extra/test/clangd/unsupported-method.test
+++ b/clang-tools-extra/clangd/test/unsupported-method.test
diff --git a/clang-tools-extra/test/clangd/utf8.test b/clang-tools-extra/clangd/test/utf8.test
index 5a00c8968dd..5a00c8968dd 100644
--- a/clang-tools-extra/test/clangd/utf8.test
+++ b/clang-tools-extra/clangd/test/utf8.test
diff --git a/clang-tools-extra/test/clangd/xpc/initialize.test b/clang-tools-extra/clangd/test/xpc/initialize.test
index 44bef65b12f..44bef65b12f 100644
--- a/clang-tools-extra/test/clangd/xpc/initialize.test
+++ b/clang-tools-extra/clangd/test/xpc/initialize.test
diff --git a/clang-tools-extra/test/clangd/xrefs.test b/clang-tools-extra/clangd/test/xrefs.test
index 128c97ff634..128c97ff634 100644
--- a/clang-tools-extra/test/clangd/xrefs.test
+++ b/clang-tools-extra/clangd/test/xrefs.test
diff --git a/clang-tools-extra/unittests/clangd/Annotations.cpp b/clang-tools-extra/clangd/unittests/Annotations.cpp
index edb0ea9a3af..edb0ea9a3af 100644
--- a/clang-tools-extra/unittests/clangd/Annotations.cpp
+++ b/clang-tools-extra/clangd/unittests/Annotations.cpp
diff --git a/clang-tools-extra/unittests/clangd/Annotations.h b/clang-tools-extra/clangd/unittests/Annotations.h
index 846c36a5b42..846c36a5b42 100644
--- a/clang-tools-extra/unittests/clangd/Annotations.h
+++ b/clang-tools-extra/clangd/unittests/Annotations.h
diff --git a/clang-tools-extra/unittests/clangd/BackgroundIndexTests.cpp b/clang-tools-extra/clangd/unittests/BackgroundIndexTests.cpp
index 91eb6dec28c..91eb6dec28c 100644
--- a/clang-tools-extra/unittests/clangd/BackgroundIndexTests.cpp
+++ b/clang-tools-extra/clangd/unittests/BackgroundIndexTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/CMakeLists.txt b/clang-tools-extra/clangd/unittests/CMakeLists.txt
index 61a720ddd57..f0471643a06 100644
--- a/clang-tools-extra/unittests/clangd/CMakeLists.txt
+++ b/clang-tools-extra/clangd/unittests/CMakeLists.txt
@@ -11,7 +11,17 @@ include_directories(
   ${CLANGD_BINARY_DIR}
   )
 
-add_extra_unittest(ClangdTests
+if(CLANG_BUILT_STANDALONE)
+  # LLVMTestingSupport library is needed for clangd tests.
+  if (EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Testing/Support
+      AND NOT TARGET LLVMTestingSupport)
+    add_subdirectory(${LLVM_MAIN_SRC_DIR}/lib/Testing/Support
+      lib/Testing/Support)
+  endif()
+endif()
+
+add_custom_target(ClangdUnitTests)
+add_unittest(ClangdUnitTests ClangdTests
   Annotations.cpp
   BackgroundIndexTests.cpp
   CancellationTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/CancellationTests.cpp b/clang-tools-extra/clangd/unittests/CancellationTests.cpp
index 611ce07dd8e..611ce07dd8e 100644
--- a/clang-tools-extra/unittests/clangd/CancellationTests.cpp
+++ b/clang-tools-extra/clangd/unittests/CancellationTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/ClangdTests.cpp b/clang-tools-extra/clangd/unittests/ClangdTests.cpp
index 5d98bdc251c..5d98bdc251c 100644
--- a/clang-tools-extra/unittests/clangd/ClangdTests.cpp
+++ b/clang-tools-extra/clangd/unittests/ClangdTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/ClangdUnitTests.cpp b/clang-tools-extra/clangd/unittests/ClangdUnitTests.cpp
index dd3fc6dd58b..dd3fc6dd58b 100644
--- a/clang-tools-extra/unittests/clangd/ClangdUnitTests.cpp
+++ b/clang-tools-extra/clangd/unittests/ClangdUnitTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp b/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp
index 97f9124e714..97f9124e714 100644
--- a/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp
+++ b/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/CodeCompletionStringsTests.cpp b/clang-tools-extra/clangd/unittests/CodeCompletionStringsTests.cpp
index 43429c86465..43429c86465 100644
--- a/clang-tools-extra/unittests/clangd/CodeCompletionStringsTests.cpp
+++ b/clang-tools-extra/clangd/unittests/CodeCompletionStringsTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/ContextTests.cpp b/clang-tools-extra/clangd/unittests/ContextTests.cpp
index d760f4eb987..d760f4eb987 100644
--- a/clang-tools-extra/unittests/clangd/ContextTests.cpp
+++ b/clang-tools-extra/clangd/unittests/ContextTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/DexTests.cpp b/clang-tools-extra/clangd/unittests/DexTests.cpp
index da744f11d1e..da744f11d1e 100644
--- a/clang-tools-extra/unittests/clangd/DexTests.cpp
+++ b/clang-tools-extra/clangd/unittests/DexTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/DiagnosticsTests.cpp b/clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
index a742c9d6206..a742c9d6206 100644
--- a/clang-tools-extra/unittests/clangd/DiagnosticsTests.cpp
+++ b/clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/DraftStoreTests.cpp b/clang-tools-extra/clangd/unittests/DraftStoreTests.cpp
index 1840892cd5e..1840892cd5e 100644
--- a/clang-tools-extra/unittests/clangd/DraftStoreTests.cpp
+++ b/clang-tools-extra/clangd/unittests/DraftStoreTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/ExpectedTypeTest.cpp b/clang-tools-extra/clangd/unittests/ExpectedTypeTest.cpp
index 8d2d60ebe55..8d2d60ebe55 100644
--- a/clang-tools-extra/unittests/clangd/ExpectedTypeTest.cpp
+++ b/clang-tools-extra/clangd/unittests/ExpectedTypeTest.cpp
diff --git a/clang-tools-extra/unittests/clangd/FSTests.cpp b/clang-tools-extra/clangd/unittests/FSTests.cpp
index 044452cae1d..044452cae1d 100644
--- a/clang-tools-extra/unittests/clangd/FSTests.cpp
+++ b/clang-tools-extra/clangd/unittests/FSTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/FileDistanceTests.cpp b/clang-tools-extra/clangd/unittests/FileDistanceTests.cpp
index 3003582959a..3003582959a 100644
--- a/clang-tools-extra/unittests/clangd/FileDistanceTests.cpp
+++ b/clang-tools-extra/clangd/unittests/FileDistanceTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/FileIndexTests.cpp b/clang-tools-extra/clangd/unittests/FileIndexTests.cpp
index 4cf589c7d8b..4cf589c7d8b 100644
--- a/clang-tools-extra/unittests/clangd/FileIndexTests.cpp
+++ b/clang-tools-extra/clangd/unittests/FileIndexTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/FindSymbolsTests.cpp b/clang-tools-extra/clangd/unittests/FindSymbolsTests.cpp
index edb6248979e..edb6248979e 100644
--- a/clang-tools-extra/unittests/clangd/FindSymbolsTests.cpp
+++ b/clang-tools-extra/clangd/unittests/FindSymbolsTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/FunctionTests.cpp b/clang-tools-extra/clangd/unittests/FunctionTests.cpp
index 0cd8b791046..0cd8b791046 100644
--- a/clang-tools-extra/unittests/clangd/FunctionTests.cpp
+++ b/clang-tools-extra/clangd/unittests/FunctionTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/FuzzyMatchTests.cpp b/clang-tools-extra/clangd/unittests/FuzzyMatchTests.cpp
index 6d5d88c0ed8..6d5d88c0ed8 100644
--- a/clang-tools-extra/unittests/clangd/FuzzyMatchTests.cpp
+++ b/clang-tools-extra/clangd/unittests/FuzzyMatchTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/GlobalCompilationDatabaseTests.cpp b/clang-tools-extra/clangd/unittests/GlobalCompilationDatabaseTests.cpp
index 7c7993cc0f9..7c7993cc0f9 100644
--- a/clang-tools-extra/unittests/clangd/GlobalCompilationDatabaseTests.cpp
+++ b/clang-tools-extra/clangd/unittests/GlobalCompilationDatabaseTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/HeadersTests.cpp b/clang-tools-extra/clangd/unittests/HeadersTests.cpp
index e1591abb11f..e1591abb11f 100644
--- a/clang-tools-extra/unittests/clangd/HeadersTests.cpp
+++ b/clang-tools-extra/clangd/unittests/HeadersTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/IndexActionTests.cpp b/clang-tools-extra/clangd/unittests/IndexActionTests.cpp
index a7a9a56e879..a7a9a56e879 100644
--- a/clang-tools-extra/unittests/clangd/IndexActionTests.cpp
+++ b/clang-tools-extra/clangd/unittests/IndexActionTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/IndexTests.cpp b/clang-tools-extra/clangd/unittests/IndexTests.cpp
index 2f67654e935..2f67654e935 100644
--- a/clang-tools-extra/unittests/clangd/IndexTests.cpp
+++ b/clang-tools-extra/clangd/unittests/IndexTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/JSONTransportTests.cpp b/clang-tools-extra/clangd/unittests/JSONTransportTests.cpp
index 3f71a10c62f..3f71a10c62f 100644
--- a/clang-tools-extra/unittests/clangd/JSONTransportTests.cpp
+++ b/clang-tools-extra/clangd/unittests/JSONTransportTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/Matchers.h b/clang-tools-extra/clangd/unittests/Matchers.h
index 0946398d814..0946398d814 100644
--- a/clang-tools-extra/unittests/clangd/Matchers.h
+++ b/clang-tools-extra/clangd/unittests/Matchers.h
diff --git a/clang-tools-extra/unittests/clangd/PrintASTTests.cpp b/clang-tools-extra/clangd/unittests/PrintASTTests.cpp
index acd77f52f17..acd77f52f17 100644
--- a/clang-tools-extra/unittests/clangd/PrintASTTests.cpp
+++ b/clang-tools-extra/clangd/unittests/PrintASTTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/QualityTests.cpp b/clang-tools-extra/clangd/unittests/QualityTests.cpp
index b797a48f7c7..b797a48f7c7 100644
--- a/clang-tools-extra/unittests/clangd/QualityTests.cpp
+++ b/clang-tools-extra/clangd/unittests/QualityTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/RIFFTests.cpp b/clang-tools-extra/clangd/unittests/RIFFTests.cpp
index 4cd54f401d5..4cd54f401d5 100644
--- a/clang-tools-extra/unittests/clangd/RIFFTests.cpp
+++ b/clang-tools-extra/clangd/unittests/RIFFTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/SelectionTests.cpp b/clang-tools-extra/clangd/unittests/SelectionTests.cpp
index ac9facca839..ac9facca839 100644
--- a/clang-tools-extra/unittests/clangd/SelectionTests.cpp
+++ b/clang-tools-extra/clangd/unittests/SelectionTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/SerializationTests.cpp b/clang-tools-extra/clangd/unittests/SerializationTests.cpp
index 3260ac68019..3260ac68019 100644
--- a/clang-tools-extra/unittests/clangd/SerializationTests.cpp
+++ b/clang-tools-extra/clangd/unittests/SerializationTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/SourceCodeTests.cpp b/clang-tools-extra/clangd/unittests/SourceCodeTests.cpp
index e9f4c00d35a..e9f4c00d35a 100644
--- a/clang-tools-extra/unittests/clangd/SourceCodeTests.cpp
+++ b/clang-tools-extra/clangd/unittests/SourceCodeTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp b/clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp
index 3d8766a0a39..3d8766a0a39 100644
--- a/clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp
+++ b/clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/SymbolInfoTests.cpp b/clang-tools-extra/clangd/unittests/SymbolInfoTests.cpp
index e0a9ecdc1f8..e0a9ecdc1f8 100644
--- a/clang-tools-extra/unittests/clangd/SymbolInfoTests.cpp
+++ b/clang-tools-extra/clangd/unittests/SymbolInfoTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/SyncAPI.cpp b/clang-tools-extra/clangd/unittests/SyncAPI.cpp
index 102cecb55c7..102cecb55c7 100644
--- a/clang-tools-extra/unittests/clangd/SyncAPI.cpp
+++ b/clang-tools-extra/clangd/unittests/SyncAPI.cpp
diff --git a/clang-tools-extra/unittests/clangd/SyncAPI.h b/clang-tools-extra/clangd/unittests/SyncAPI.h
index c1416524153..c1416524153 100644
--- a/clang-tools-extra/unittests/clangd/SyncAPI.h
+++ b/clang-tools-extra/clangd/unittests/SyncAPI.h
diff --git a/clang-tools-extra/unittests/clangd/TUSchedulerTests.cpp b/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp
index a7d032ccc57..a7d032ccc57 100644
--- a/clang-tools-extra/unittests/clangd/TUSchedulerTests.cpp
+++ b/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/TestFS.cpp b/clang-tools-extra/clangd/unittests/TestFS.cpp
index c5b2613f759..c5b2613f759 100644
--- a/clang-tools-extra/unittests/clangd/TestFS.cpp
+++ b/clang-tools-extra/clangd/unittests/TestFS.cpp
diff --git a/clang-tools-extra/unittests/clangd/TestFS.h b/clang-tools-extra/clangd/unittests/TestFS.h
index eabdddf70ac..eabdddf70ac 100644
--- a/clang-tools-extra/unittests/clangd/TestFS.h
+++ b/clang-tools-extra/clangd/unittests/TestFS.h
diff --git a/clang-tools-extra/unittests/clangd/TestIndex.cpp b/clang-tools-extra/clangd/unittests/TestIndex.cpp
index 11ac4239df1..11ac4239df1 100644
--- a/clang-tools-extra/unittests/clangd/TestIndex.cpp
+++ b/clang-tools-extra/clangd/unittests/TestIndex.cpp
diff --git a/clang-tools-extra/unittests/clangd/TestIndex.h b/clang-tools-extra/clangd/unittests/TestIndex.h
index 01de089eabf..01de089eabf 100644
--- a/clang-tools-extra/unittests/clangd/TestIndex.h
+++ b/clang-tools-extra/clangd/unittests/TestIndex.h
diff --git a/clang-tools-extra/unittests/clangd/TestScheme.h b/clang-tools-extra/clangd/unittests/TestScheme.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang-tools-extra/unittests/clangd/TestScheme.h
+++ b/clang-tools-extra/clangd/unittests/TestScheme.h
diff --git a/clang-tools-extra/unittests/clangd/TestTU.cpp b/clang-tools-extra/clangd/unittests/TestTU.cpp
index 05c7fbf8bf4..05c7fbf8bf4 100644
--- a/clang-tools-extra/unittests/clangd/TestTU.cpp
+++ b/clang-tools-extra/clangd/unittests/TestTU.cpp
diff --git a/clang-tools-extra/unittests/clangd/TestTU.h b/clang-tools-extra/clangd/unittests/TestTU.h
index 0f5951695f7..0f5951695f7 100644
--- a/clang-tools-extra/unittests/clangd/TestTU.h
+++ b/clang-tools-extra/clangd/unittests/TestTU.h
diff --git a/clang-tools-extra/unittests/clangd/ThreadingTests.cpp b/clang-tools-extra/clangd/unittests/ThreadingTests.cpp
index 18b9146ef14..18b9146ef14 100644
--- a/clang-tools-extra/unittests/clangd/ThreadingTests.cpp
+++ b/clang-tools-extra/clangd/unittests/ThreadingTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/TraceTests.cpp b/clang-tools-extra/clangd/unittests/TraceTests.cpp
index 1871e6acf10..1871e6acf10 100644
--- a/clang-tools-extra/unittests/clangd/TraceTests.cpp
+++ b/clang-tools-extra/clangd/unittests/TraceTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/TweakTests.cpp b/clang-tools-extra/clangd/unittests/TweakTests.cpp
index baa60292e3d..baa60292e3d 100644
--- a/clang-tools-extra/unittests/clangd/TweakTests.cpp
+++ b/clang-tools-extra/clangd/unittests/TweakTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/TypeHierarchyTests.cpp b/clang-tools-extra/clangd/unittests/TypeHierarchyTests.cpp
index 79307e28da4..79307e28da4 100644
--- a/clang-tools-extra/unittests/clangd/TypeHierarchyTests.cpp
+++ b/clang-tools-extra/clangd/unittests/TypeHierarchyTests.cpp
diff --git a/clang-tools-extra/unittests/clangd/URITests.cpp b/clang-tools-extra/clangd/unittests/URITests.cpp
index 52ca7b4447c..52ca7b4447c 100644
--- a/clang-tools-extra/unittests/clangd/URITests.cpp
+++ b/clang-tools-extra/clangd/unittests/URITests.cpp
diff --git a/clang-tools-extra/unittests/clangd/XRefsTests.cpp b/clang-tools-extra/clangd/unittests/XRefsTests.cpp
index a9fb5898435..a9fb5898435 100644
--- a/clang-tools-extra/unittests/clangd/XRefsTests.cpp
+++ b/clang-tools-extra/clangd/unittests/XRefsTests.cpp
diff --git a/clang-tools-extra/clangd/unittests/lit.cfg.in b/clang-tools-extra/clangd/unittests/lit.cfg.in
new file mode 100644
index 00000000000..14f365e21f0
--- /dev/null
+++ b/clang-tools-extra/clangd/unittests/lit.cfg.in
@@ -0,0 +1,23 @@
+@LIT_SITE_CFG_IN_HEADER@
+# This is a shim to run the gtest unittests in ../unittests using lit.
+
+import lit.formats
+config.name = "Clangd Unit Tests"
+config.test_format = lit.formats.GoogleTest('.', 'Tests')
+config.test_source_root = "@CMAKE_CURRENT_BINARY_DIR@"
+config.test_exec_root = "@CMAKE_CURRENT_BINARY_DIR@"
+
+# Point the dynamic loader at dynamic libraries in 'lib'.
+# XXX: it seems every project has a copy of this logic. Move it somewhere.
+import platform
+if platform.system() == 'Darwin':
+    shlibpath_var = 'DYLD_LIBRARY_PATH'
+elif platform.system() == 'Windows':
+    shlibpath_var = 'PATH'
+else:
+    shlibpath_var = 'LD_LIBRARY_PATH'
+config.environment[shlibpath_var] = os.path.pathsep.join((
+    "@SHLIBDIR@", "@LLVM_LIBS_DIR@",
+    config.environment.get(shlibpath_var,'')))
+
+
diff --git a/clang-tools-extra/unittests/clangd/xpc/CMakeLists.txt b/clang-tools-extra/clangd/unittests/xpc/CMakeLists.txt
index 229ad5af47e..229ad5af47e 100644
--- a/clang-tools-extra/unittests/clangd/xpc/CMakeLists.txt
+++ b/clang-tools-extra/clangd/unittests/xpc/CMakeLists.txt
diff --git a/clang-tools-extra/unittests/clangd/xpc/ConversionTests.cpp b/clang-tools-extra/clangd/unittests/xpc/ConversionTests.cpp
index 5d0efd83509..5d0efd83509 100644
--- a/clang-tools-extra/unittests/clangd/xpc/ConversionTests.cpp
+++ b/clang-tools-extra/clangd/unittests/xpc/ConversionTests.cpp
diff --git a/clang-tools-extra/test/CMakeLists.txt b/clang-tools-extra/test/CMakeLists.txt
index 0978f3b37cf..a2cedeaaa53 100644
--- a/clang-tools-extra/test/CMakeLists.txt
+++ b/clang-tools-extra/test/CMakeLists.txt
@@ -15,9 +15,7 @@ endif ()
 
 string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} CLANG_TOOLS_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
 
-llvm_canonicalize_cmake_booleans(
-  CLANG_ENABLE_STATIC_ANALYZER
-  CLANGD_BUILD_XPC)
+llvm_canonicalize_cmake_booleans(CLANG_ENABLE_STATIC_ANALYZER)
 
 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
@@ -70,19 +68,6 @@ set(CLANG_TOOLS_TEST_DEPS
   clang
 )
 
-if(CLANGD_BUILD_XPC)
-  list(APPEND CLANG_TOOLS_TEST_DEPS clangd-xpc-test-client)
-endif()
-
-set(CLANGD_TEST_DEPS
-  clangd
-  ClangdTests
-  # clangd-related tools which don't have tests, add them to the test to make
-  # sure we don't introduce new changes that break their compilations.
-  clangd-indexer
-  dexp
-  )
-
 # Add lit test dependencies.
 set(LLVM_UTILS_DEPS
   FileCheck count not
@@ -93,11 +78,6 @@ foreach(dep ${LLVM_UTILS_DEPS})
   endif()
 endforeach()
 
-foreach(clangd_dep ${CLANGD_TEST_DEPS})
-  list(APPEND CLANG_TOOLS_TEST_DEPS
-       ${clangd_dep})
-endforeach()
-
 add_lit_testsuite(check-clang-tools "Running the Clang extra tools' regression tests"
   ${CMAKE_CURRENT_BINARY_DIR}
   DEPENDS ${CLANG_TOOLS_TEST_DEPS}
@@ -105,15 +85,3 @@ add_lit_testsuite(check-clang-tools "Running the Clang extra tools' regression t
   )
 
 set_target_properties(check-clang-tools PROPERTIES FOLDER "Clang extra tools' tests")
-
-# Setup an individual test for building and testing clangd-only stuff.
-# Note: all clangd tests have been covered in check-clang-tools, this is a
-# convenient target for clangd developers.
-# Exclude check-clangd from check-all.
-set(EXCLUDE_FROM_ALL ON)
-add_lit_testsuite(check-clangd "Running the Clangd regression tests"
-  ${CMAKE_CURRENT_BINARY_DIR}/Unit/clangd;${CMAKE_CURRENT_BINARY_DIR}/clangd
-  DEPENDS ${CLANGD_TEST_DEPS}
-)
-set_target_properties(check-clangd PROPERTIES FOLDER "Clangd tests")
-set(EXCLUDE_FROM_ALL OFF)
diff --git a/clang-tools-extra/test/clangd/Unit/lit.site.cfg.py.in b/clang-tools-extra/test/clangd/Unit/lit.site.cfg.py.in
new file mode 100644
index 00000000000..dc7ee330d13
--- /dev/null
+++ b/clang-tools-extra/test/clangd/Unit/lit.site.cfg.py.in
@@ -0,0 +1,9 @@
+@LIT_SITE_CFG_IN_HEADER@
+
+config.extra_tools_obj_dir = "@CLANG_TOOLS_BINARY_DIR@/unittests"
+config.extra_tools_src_dir = "@CLANG_TOOLS_SOURCE_DIR@/unittests"
+config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
+config.shlibdir = "@SHLIBDIR@"
+config.target_triple = "@TARGET_TRIPLE@"
+
+lit_config.load_config(config, "@CLANG_TOOLS_SOURCE_DIR@/test/Unit/lit.cfg.py")
diff --git a/clang-tools-extra/unittests/CMakeLists.txt b/clang-tools-extra/unittests/CMakeLists.txt
index ce6e6651aeb..086a68e6383 100644
--- a/clang-tools-extra/unittests/CMakeLists.txt
+++ b/clang-tools-extra/unittests/CMakeLists.txt
@@ -5,15 +5,6 @@ function(add_extra_unittest test_dirname)
   add_unittest(ExtraToolsUnitTests ${test_dirname} ${ARGN})
 endfunction()
 
-if(CLANG_BUILT_STANDALONE)
-  # LLVMTestingSupport library is needed for clangd tests.
-  if (EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Testing/Support
-      AND NOT TARGET LLVMTestingSupport)
-    add_subdirectory(${LLVM_MAIN_SRC_DIR}/lib/Testing/Support
-      lib/Testing/Support)
-  endif()
-endif()
-
 add_subdirectory(clang-apply-replacements)
 add_subdirectory(clang-change-namespace)
 add_subdirectory(clang-doc)
@@ -21,4 +12,3 @@ add_subdirectory(clang-include-fixer)
 add_subdirectory(clang-move)
 add_subdirectory(clang-query)
 add_subdirectory(clang-tidy)
-add_subdirectory(clangd)