diff options
| author | Hans Wennborg <hans@hanshq.net> | 2018-02-12 09:54:35 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2018-02-12 09:54:35 +0000 |
| commit | c7f15b42c952c59af48126e428a9cc83f5a1ce47 (patch) | |
| tree | 42815237862620ec7d751fd10ba7a3c8cd4fe1e7 | |
| parent | aab77cdb6b6975c6569749bb367e88af41ecb3f0 (diff) | |
Merging r323040:
------------------------------------------------------------------------
r323040 | dim | 2018-01-20 15:34:33 +0100 (Sat, 20 Jan 2018) | 5 lines
Assume the shared library path variable is LD_LIBRARY_PATH on systems
except Darwin and Windows. This prevents inserting an environment
variable with an empty name (which is illegal and leads to a Python
exception) on any of the BSDs.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/branches/release_60@324871 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | test/Unit/lit.cfg | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg index fc63afdb..b40e1cae 100644 --- a/test/Unit/lit.cfg +++ b/test/Unit/lit.cfg @@ -19,13 +19,12 @@ config.test_exec_root = config.test_source_root # ;-separated list of subdirectories). config.test_format = lit.formats.GoogleTest('.', 'Tests') -shlibpath_var = '' -if platform.system() == 'Linux': - shlibpath_var = 'LD_LIBRARY_PATH' -elif platform.system() == 'Darwin': +if platform.system() == 'Darwin': shlibpath_var = 'DYLD_LIBRARY_PATH' elif platform.system() == 'Windows': shlibpath_var = 'PATH' +else: + shlibpath_var = 'LD_LIBRARY_PATH' # Point the dynamic loader at dynamic libraries in 'lib'. shlibpath = os.path.pathsep.join((config.shlibdir, config.llvm_libs_dir, |