aboutsummaryrefslogtreecommitdiffstats
path: root/test/Unit
diff options
context:
space:
mode:
authorNAKAMURA Takumi <geek4civic@gmail.com>2010-11-29 00:20:21 +0000
committerNAKAMURA Takumi <geek4civic@gmail.com>2010-11-29 00:20:21 +0000
commit38d439fb13ae465d53767c1c912abf40e64d6ee4 (patch)
treee670f7974b025ca1e55273fe7147d7a51297f3e9 /test/Unit
parentb3ccc12831cedb8785611192f47377a947df8dce (diff)
downloadexternal_llvm-38d439fb13ae465d53767c1c912abf40e64d6ee4.zip
external_llvm-38d439fb13ae465d53767c1c912abf40e64d6ee4.tar.gz
external_llvm-38d439fb13ae465d53767c1c912abf40e64d6ee4.tar.bz2
test: Use $SharedLibDir for loadable modules. On Cygming, loadable modules are not in lib/ but bin.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@120274 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Unit')
-rw-r--r--test/Unit/lit.cfg5
-rw-r--r--test/Unit/lit.site.cfg.in1
2 files changed, 3 insertions, 3 deletions
diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg
index 5fe0732..a41f093 100644
--- a/test/Unit/lit.cfg
+++ b/test/Unit/lit.cfg
@@ -25,11 +25,10 @@ config.test_format = lit.formats.GoogleTest(llvm_build_mode, 'Tests')
# 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
+ shlibpath = os.pathsep + shlibpath
+ shlibpath = config.shlibdir + shlibpath
config.environment[config.shlibpath_var] = shlibpath
# Check that the object root is known.
diff --git a/test/Unit/lit.site.cfg.in b/test/Unit/lit.site.cfg.in
index 75932a4..9643507 100644
--- a/test/Unit/lit.site.cfg.in
+++ b/test/Unit/lit.site.cfg.in
@@ -6,6 +6,7 @@ config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
config.llvmgcc_dir = "@LLVMGCCDIR@"
config.llvm_build_mode = "@LLVM_BUILD_MODE@"
config.enable_shared = @ENABLE_SHARED@
+config.shlibdir = "@SHLIBDIR@"
config.shlibpath_var = "@SHLIBPATH_VAR@"
# Support substitution of the tools_dir and build_mode with user parameters.