Skip to content

Commit

Permalink
Travis lit tests use wrong jit lib (from host compiler) (#3152)
Browse files Browse the repository at this point in the history
  • Loading branch information
Hardcode84 committed Sep 7, 2019
1 parent a9b9097 commit 2724c0d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ install:
- python -c "import lit; lit.main();" --version | head -n 1

script:
- unset LD_LIBRARY_PATH
- cmake --version
- ninja --version
- |
Expand Down
12 changes: 12 additions & 0 deletions tests/lit.site.cfg.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import platform
import string
import re
import subprocess
import glob
from distutils.version import LooseVersion

# Cmake Boolean options
Expand Down Expand Up @@ -221,3 +222,14 @@ if config.llvm_version >= 800:
else:
config.substitutions.append( ('%disable_fp_elim', '-disable-fp-elim') )
config.substitutions.append( ('%enable_fp_elim', '-disable-fp-elim=false') )

if 'LD_LIBRARY_PATH' in os.environ:
libs = []
for lib_path in [s for s in os.environ['LD_LIBRARY_PATH'].split(':') if s]:
for pattern in ['*ldc-jit*','*druntime-ldc*','*phobos2-ldc*']:
libs += glob.glob(os.path.join(lib_path, pattern))

if libs:
print('Warning: LDC runtime libs found in LD_LIBRARY_PATH:')
for l in libs:
print(l)

0 comments on commit 2724c0d

Please sign in to comment.