[openmp] [test] Fix prepending config.library_dir to LD_LIBRARY_PATH
Fix the LD_LIBRARY_PATH prepending order to make sure that
config.library_path ends up before any potentially-system directories
(e.g. config.hwloc_library_dir). This makes sure that we are testing
against the just-built openmp libraries rather than the version that is
already installed.
Also rename the function to `prepend_*` to make it clearer what it
actually does.
https://github.com/llvm/llvm-project/issues/56821
Differential Revision: https://reviews.llvm.org/D130825
GitOrigin-RevId: eb4612ca239bffbf1612e0bce442043e716bb9f5
diff --git a/runtime/test/lit.cfg b/runtime/test/lit.cfg
index 76727f3..b000787 100644
--- a/runtime/test/lit.cfg
+++ b/runtime/test/lit.cfg
@@ -11,7 +11,7 @@
config = object()
lit_config = object()
-def append_dynamic_library_path(path):
+def prepend_dynamic_library_path(path):
if config.operating_system == 'Windows':
name = 'PATH'
sep = ';'
@@ -65,10 +65,13 @@
config.available_features.add(feature)
# Setup environment to find dynamic library at runtime
-append_dynamic_library_path(config.library_dir)
if config.using_hwloc:
- append_dynamic_library_path(config.hwloc_library_dir)
+ prepend_dynamic_library_path(config.hwloc_library_dir)
config.available_features.add('hwloc')
+# Note: please keep config.library_dir *after* any potentially system
+# directories, as otherwise preinstalled openmp libraries will be used
+# over just-built
+prepend_dynamic_library_path(config.library_dir)
# Rpath modifications for Darwin
if config.operating_system == 'Darwin':
