diff options
| author | Michał Górny <mgorny@moritz.systems> | 2022-07-30 20:53:02 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@moritz.systems> | 2022-08-01 18:54:06 +0200 |
| commit | eb4612ca239bffbf1612e0bce442043e716bb9f5 (patch) | |
| tree | a122d08e21a47f5bc944cde84a43ef01630cc6c2 /openmp/runtime | |
| parent | 37047a26731a6731c949682e159fe40786e6d711 (diff) | |
| download | llvm-eb4612ca239bffbf1612e0bce442043e716bb9f5.zip llvm-eb4612ca239bffbf1612e0bce442043e716bb9f5.tar.gz llvm-eb4612ca239bffbf1612e0bce442043e716bb9f5.tar.bz2 | |
[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
Diffstat (limited to 'openmp/runtime')
| -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 76727f3..b000787 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': |