[Openmp-commits] [PATCH] D130825: [openmp] [test] Fix prepending config.library_dir to LD_LIBRARY_PATH

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

mgorny created this revision.
mgorny added a reviewer: jlpeyton.
Herald added subscribers: guansong, yaxunl.
Herald added a project: All.
mgorny requested review of this revision.
Herald added a reviewer: jdoerfert.
Herald added a subscriber: sstefan1.

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.

Bug #56821


https://reviews.llvm.org/D130825

Files:
  openmp/runtime/test/lit.cfg


Index: openmp/runtime/test/lit.cfg
===================================================================
--- openmp/runtime/test/lit.cfg
+++ openmp/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':


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D130825.448807.patch
Type: text/x-patch
Size: 1053 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20220730/fbe81dd1/attachment-0001.bin>