[PATCH] D135062: [clang-tools-extra] [clangd] Respect llvm_shlib_dir in tests

[Michał Górny via Phabricator via cfe-commits]

mgorny created this revision.
mgorny added reviewers: sammccall, kadircet, hokein, ilya-biryukov, kbobyrev, MaskRay, thesamesam.
Herald added subscribers: StephenFan, arphaman.
Herald added a project: All.
mgorny requested review of this revision.
Herald added a project: clang-tools-extra.

Add llvm_shlib_dir to variables used in clangd test suite, consistently
to how it is used in the test suites of clang, clang-tools-extra
and a few other components.  This is necessary to ensure that
the correct shared libraries are used when building clang standalone --
otherwise, use_clang() sets LD_LIBRARY_PATH to the directory containing
the earlier system installation of clang rather than the just-built
library.

(I'd also like to backport this to 15.x)


https://reviews.llvm.org/D135062

Files:
  clang-tools-extra/clangd/test/lit.site.cfg.py.in


Index: clang-tools-extra/clangd/test/lit.site.cfg.py.in
===================================================================
--- clang-tools-extra/clangd/test/lit.site.cfg.py.in
+++ clang-tools-extra/clangd/test/lit.site.cfg.py.in
@@ -10,6 +10,7 @@
 config.clang_tools_dir = lit_config.substitute("@CURRENT_TOOLS_DIR@")
 config.llvm_tools_dir = lit_config.substitute("@LLVM_TOOLS_DIR@")
 config.llvm_libs_dir = lit_config.substitute("@LLVM_LIBS_DIR@")
+config.llvm_shlib_dir = "@SHLIBDIR@"
 
 config.clangd_source_dir = "@CMAKE_CURRENT_SOURCE_DIR@/.."
 config.clangd_binary_dir = "@CMAKE_CURRENT_BINARY_DIR@/.."


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D135062.464617.patch
Type: text/x-patch
Size: 611 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20221003/4ca5baf2/attachment-0001.bin>