[gn] Update the clangd test lit site configuration

[phosek]

Summary

This reflects changes made in r359763.

[thakis]

Thanks! This is incomplete:

• Create clangd_lit_site_cfg_files.gni next to this build file, but path to generated files there
• Edit llvm/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn and add remapping there

Else out/gn/bin/llvm-lit clang-tools-extra/clangd/test/path/to/test won't work.

Compare to all the other test targets (e.g. clang-tools-extra) for an example.

[phosek]

In D61456#1488383, @thakis wrote:

Thanks! This is incomplete:

• Create clangd_lit_site_cfg_files.gni next to this build file, but path to generated files there
• Edit llvm/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn and add remapping there

Else out/gn/bin/llvm-lit clang-tools-extra/clangd/test/path/to/test won't work.

Compare to all the other test targets (e.g. clang-tools-extra) for an example.

Done

[thakis]

This landed in r359825.

llvm/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn

 import("//clang-tools-extra/clangd/xpc/enable.gni")
 import("//llvm/triples.gni")
 import("//llvm/utils/gn/build/write_cmake_config.gni")
-
-clangd_lit_site_cfg_file = "$root_gen_dir/clang-tools-extra/clangd/test/lit.cfg"
-clangd_lit_unit_site_cfg_file =
-    "$root_gen_dir/clang-tools-extra/clangd/unittests/lit.cfg"
+import("clangd_lit_site_cfg_files.gni")
 
 template("write_lit_config") {
   write_cmake_config(target_name) {
     input = invoker.input
     output = invoker.output
     values = [
       "LIT_SITE_CFG_IN_HEADER=## Autogenerated from $input, do not edit",
       "LLVM_LIBS_DIR=",  # needed only for shared builds
     ]
     values += invoker.extra_values
   }
 }
 
 write_lit_config("lit_site_cfg") {
   # Fully-qualified instead of relative for LIT_SITE_CFG_IN_HEADER.
-  input = "//clang-tools-extra/clangd/test/lit.cfg.in"
+  input = "//clang-tools-extra/clangd/test/lit.site.cfg.py.in"
   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_SOURCE_DIR=" +
         rebase_path("//clang-tools-extra/clangd/test"),
 
if (clangd_build_xpc) {
     extra_values += [ "CLANGD_BUILD_XPC=1" ]
   } else {
     extra_values += [ "CLANGD_BUILD_XPC=0" ]
   }
 }
 
 write_lit_config("lit_unit_site_cfg") {
   # Fully-qualified instead of relative for LIT_SITE_CFG_IN_HEADER.
-  input = "//clang-tools-extra/clangd/unittests/lit.cfg.in"
+  input = "//clang-tools-extra/clangd/unittests/lit.site.cfg.py.in"
   output = clangd_lit_unit_site_cfg_file
   extra_values =
       [ "CMAKE_CURRENT_BINARY_DIR=" +
         rebase_path(get_label_info("//clang-tools-extra/clangd/unittests",
-                                   "target_out_dir")) ]
+                                   "target_out_dir")),
+        "CMAKE_CURRENT_SOURCE_DIR=" +
+            rebase_path("//clang-tools-extra/clangd/unittest")]
   if (host_os == "win") {
     # See comment for Windows solink in llvm/utils/gn/build/toolchain/BUILD.gn
     extra_values += [ "SHLIBDIR=" + rebase_path("$root_out_dir/bin") ]
   } else {
     extra_values += [ "SHLIBDIR=" + rebase_path("$root_out_dir/lib") ]
   }
 }
 

llvm/utils/gn/secondary/clang-tools-extra/clangd/test/clangd_lit_site_cfg_files.gni

+clangd_lit_site_cfg_file =
+    "$root_gen_dir/clang-tools-extra/clangd/test/lit.site.cfg.py"
+clangd_lit_unit_site_cfg_file =
+    "$root_gen_dir/clang-tools-extra/clangd/unittests/lit.site.cfg.py"

llvm/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn

 import("//clang-tools-extra/test/clang_tools_extra_lit_site_cfg_files.gni")
+import("//clang-tools-extra/clangd/test/clangd_lit_site_cfg_files.gni")
 import("//clang/test/clang_lit_site_cfg_files.gni")
 import("//lld/test/lld_lit_site_cfg_files.gni")
 import("//llvm/test/llvm_lit_site_cfg_files.gni")
 import("//llvm/utils/gn/build/write_cmake_config.gni")
 
 write_cmake_config("llvm-lit") {
   input = "llvm-lit.in"
   output = "$root_out_dir/bin/llvm-lit"
write_cmake_config("llvm-lit") {
 
   # Note: \n is converted into a newline by write_cmake_config.py, not by gn.
   config_map +=
       "map_config('" + rebase_path("//clang-tools-extra/test/lit.cfg.py") +
       "', '" + rebase_path(clang_tools_extra_lit_site_cfg_file) + "')\n"
   config_map +=
       "map_config('" + rebase_path("//clang-tools-extra/test/Unit/lit.cfg.py") +
       "', '" + rebase_path(clang_tools_extra_lit_unit_site_cfg_file) + "')\n"
+  config_map +=
+      "map_config('" + rebase_path("//clang-tools-extra/clangd/test/lit.cfg.py") +
+      "', '" + rebase_path(clangd_lit_site_cfg_file) + "')\n"
+  config_map +=
+      "map_config('" + rebase_path("//clang-tools-extra/clang/unittests/lit.cfg.py") +
+      "', '" + rebase_path(clangd_lit_unit_site_cfg_file) + "')\n"
   config_map += "map_config('" + rebase_path("//clang/test/lit.cfg.py") +
                 "', '" + rebase_path(clang_lit_site_cfg_file) + "')\n"
   config_map += "map_config('" + rebase_path("//clang/test/Unit/lit.cfg.py") +
                 "', '" + rebase_path(clang_lit_unit_site_cfg_file) + "')\n"
   config_map += "map_config('" + rebase_path("//lld/test/lit.cfg.py") + "', '" +
                 rebase_path(lld_lit_site_cfg_file) + "')\n"
   config_map += "map_config('" + rebase_path("//lld/test/Unit/lit.cfg.py") +
                 "', '" + rebase_path(lld_lit_unit_site_cfg_file) + "')\n"