diff options
| author | Michał Górny <mgorny@moritz.systems> | 2022-07-30 20:53:02 +0200 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2022-08-02 21:29:50 -0700 |
| commit | 96a26d96c7d468af4dde717827365e5eeb5e289d (patch) | |
| tree | e960fc5d1bcdca7ba85f3c2f973ba9eb710a044d | |
| parent | 0601c8a6d616176ce1ec1048d404d5c241b1b393 (diff) | |
[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
(cherry picked from commit eb4612ca239bffbf1612e0bce442043e716bb9f5)
| -rw-r--r-- | openmp/runtime/test/lit.cfg | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/openmp/runtime/test/lit.cfg b/openmp/runtime/test/lit.cfg index 76727f3ed528..b000787409ef 100644 --- a/openmp/runtime/test/lit.cfg +++ b/openmp/runtime/test/lit.cfg @@ -11,7 +11,7 @@ if 'PYLINT_IMPORT' in os.environ: 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 @@ for feature in config.test_compiler_features: 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': |