diff options
| author | rdivacky <rdivacky@FreeBSD.org> | 2010-03-03 17:27:15 +0000 |
|---|---|---|
| committer | rdivacky <rdivacky@FreeBSD.org> | 2010-03-03 17:27:15 +0000 |
| commit | 8230c40430a1325b5cc5bc0221931487b4bd573c (patch) | |
| tree | 836a05cff50ca46176117b86029f061fa4db54f0 /test/Unit | |
| parent | f25ddd991a5601d0101602c4c263a58c7af4b8a2 (diff) | |
| download | FreeBSD-src-8230c40430a1325b5cc5bc0221931487b4bd573c.zip FreeBSD-src-8230c40430a1325b5cc5bc0221931487b4bd573c.tar.gz | |
Update LLVM to 97654.
Diffstat (limited to 'test/Unit')
| -rw-r--r-- | test/Unit/lit.cfg | 9 | ||||
| -rw-r--r-- | test/Unit/lit.site.cfg.in | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg index 34372bb..5fe0732 100644 --- a/test/Unit/lit.cfg +++ b/test/Unit/lit.cfg @@ -23,7 +23,14 @@ config.test_format = lit.formats.GoogleTest(llvm_build_mode, 'Tests') ### -import os +# If necessary, point the dynamic loader at libLLVM.so. +if config.enable_shared: + libdir = os.path.join(config.llvm_obj_root, config.llvm_build_mode, 'lib') + shlibpath = config.environment.get(config.shlibpath_var,'') + if shlibpath: + shlibpath = ':' + shlibpath + shlibpath = libdir + shlibpath + config.environment[config.shlibpath_var] = shlibpath # Check that the object root is known. if config.test_exec_root is None: diff --git a/test/Unit/lit.site.cfg.in b/test/Unit/lit.site.cfg.in index c190ffa..51b5bc4 100644 --- a/test/Unit/lit.site.cfg.in +++ b/test/Unit/lit.site.cfg.in @@ -5,6 +5,8 @@ config.llvm_obj_root = "@LLVM_BINARY_DIR@" config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" config.llvmgcc_dir = "@LLVMGCCDIR@" config.llvm_build_mode = "@LLVM_BUILD_MODE@" +config.enable_shared = @ENABLE_SHARED@ +config.shlibpath_var = "@SHLIBPATH_VAR@" # Let the main config do the real work. lit.load_config(config, "@LLVM_SOURCE_DIR@/test/Unit/lit.cfg") |
