[clang-tools-extra] 13498bc - [clang-tools-extra][Unittest] Fix wrong reference to CMake configuration variable (#164147)

[via cfe-commits]

Author: Tomohiro Kashiwada
Date: 2025-10-20T23:14:54+03:00
New Revision: 13498bc1d16005774a62b3dd04f1d2e5dd887674

URL: https://github.com/llvm/llvm-project/commit/13498bc1d16005774a62b3dd04f1d2e5dd887674
DIFF: https://github.com/llvm/llvm-project/commit/13498bc1d16005774a62b3dd04f1d2e5dd887674.diff

LOG: [clang-tools-extra][Unittest] Fix wrong reference to CMake configuration variable (#164147)

`@SHLIBDIR@` is replaced by CMake's configuration function, so it must
be in `lit.site.cfg.py.in` but not `lit.cfg.py`. `lit.cfg.py` must
reference variables in generated `lit.site.cfg.py`.

We didn't notice this problem because it only affects Windows (including
MinGW and Cygwin) that are configured with either
LLVM_LINK_LLVM_DYLIB=ON or BUILD_SHARED=ON.

Added: 
    

Modified: 
    clang-tools-extra/clangd/unittests/lit.cfg.py
    clang-tools-extra/include-cleaner/test/Unit/lit.cfg.py

Removed: 
    


################################################################################
diff  --git a/clang-tools-extra/clangd/unittests/lit.cfg.py b/clang-tools-extra/clangd/unittests/lit.cfg.py
index 4c3f0f028acdd..666e9879bb4ad 100644
--- a/clang-tools-extra/clangd/unittests/lit.cfg.py
+++ b/clang-tools-extra/clangd/unittests/lit.cfg.py
@@ -24,7 +24,7 @@
 else:
     shlibpath_var = "LD_LIBRARY_PATH"
 config.environment[shlibpath_var] = os.path.pathsep.join(
-    ("@SHLIBDIR@", "@LLVM_LIBS_DIR@", config.environment.get(shlibpath_var, ""))
+    (config.shlibdir, config.llvm_libs_dir, config.environment.get(shlibpath_var, ""))
 )
 
 # It is not realistically possible to account for all options that could

diff  --git a/clang-tools-extra/include-cleaner/test/Unit/lit.cfg.py b/clang-tools-extra/include-cleaner/test/Unit/lit.cfg.py
index 010d28e036f83..c4454df06b386 100644
--- a/clang-tools-extra/include-cleaner/test/Unit/lit.cfg.py
+++ b/clang-tools-extra/include-cleaner/test/Unit/lit.cfg.py
@@ -16,7 +16,7 @@
 else:
     shlibpath_var = "LD_LIBRARY_PATH"
 config.environment[shlibpath_var] = os.path.pathsep.join(
-    ("@SHLIBDIR@", "@LLVM_LIBS_DIR@", config.environment.get(shlibpath_var, ""))
+    (config.shlibdir, config.llvm_libs_dir, config.environment.get(shlibpath_var, ""))
 )
 
 # It is not realistically possible to account for all options that could