diff options
| -rw-r--r-- | test/Unit/lit.cfg | 9 | ||||
| -rw-r--r-- | test/lit.cfg | 5 | ||||
| -rw-r--r-- | test/lit.site.cfg.in | 1 |
3 files changed, 11 insertions, 4 deletions
diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg index ff70123c..3a1da187 100644 --- a/test/Unit/lit.cfg +++ b/test/Unit/lit.cfg @@ -41,14 +41,17 @@ elif platform.system() == 'Windows': shlibpath_var = 'PATH' # Point the dynamic loader at dynamic libraries in 'lib'. +shlibdir = getattr(config, 'shlibdir', None) +if not shlibdir: + lit_config.fatal('No shlibdir set!') llvm_libs_dir = getattr(config, 'llvm_libs_dir', None) if not llvm_libs_dir: lit_config.fatal('No LLVM libs dir set!') -shlibpath = os.path.pathsep.join((llvm_libs_dir, +shlibpath = os.path.pathsep.join((shlibdir, llvm_libs_dir, config.environment.get(shlibpath_var,''))) # Win32 seeks DLLs along %PATH%. -if sys.platform in ['win32', 'cygwin'] and os.path.isdir(config.shlibdir): - shlibpath = os.path.pathsep.join((config.shlibdir, shlibpath)) +if sys.platform in ['win32', 'cygwin'] and os.path.isdir(shlibdir): + shlibpath = os.path.pathsep.join((shlibdir, shlibpath)) config.environment[shlibpath_var] = shlibpath diff --git a/test/lit.cfg b/test/lit.cfg index bb592936..0e7de849 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -99,10 +99,13 @@ if clang_tools_binary_dir is not None: clang_tools_dir, llvm_tools_dir, config.environment['PATH'])) config.environment['PATH'] = path + clang_libs_dir = getattr(config, 'clang_libs_dir', None) + if not clang_libs_dir: + lit_config.fatal('No Clang libs dir set!') llvm_libs_dir = getattr(config, 'llvm_libs_dir', None) if not llvm_libs_dir: lit_config.fatal('No LLVM libs dir set!') - path = os.path.pathsep.join((llvm_libs_dir, + path = os.path.pathsep.join((clang_libs_dir, llvm_libs_dir, config.environment.get('LD_LIBRARY_PATH',''))) config.environment['LD_LIBRARY_PATH'] = path diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in index dfd0164c..f310b59a 100644 --- a/test/lit.site.cfg.in +++ b/test/lit.site.cfg.in @@ -7,6 +7,7 @@ config.llvm_libs_dir = "@LLVM_LIBS_DIR@" config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@" config.clang_tools_binary_dir = "@CLANG_TOOLS_BINARY_DIR@" config.clang_tools_dir = "@CLANG_TOOLS_DIR@" +config.clang_libs_dir = "@SHLIBDIR@" config.python_executable = "@PYTHON_EXECUTABLE@" config.target_triple = "@TARGET_TRIPLE@" |