summaryrefslogtreecommitdiff
path: root/test/Unit
diff options
context:
space:
mode:
authorJeffrey Yasskin <jyasskin@google.com>2010-02-18 04:43:02 +0000
committerJeffrey Yasskin <jyasskin@google.com>2010-02-18 04:43:02 +0000
commit2155d459a7de626bb77849e5956ef2363d7d4a87 (patch)
treeb0659bdb76efe558b1dbdceaff2d5f3eda2f2ee5 /test/Unit
parentadb561d4e0a37c21159405dde90d2ef2d1a5eef9 (diff)
downloadllvm-2155d459a7de626bb77849e5956ef2363d7d4a87.tar.gz
llvm-2155d459a7de626bb77849e5956ef2363d7d4a87.tar.bz2
llvm-2155d459a7de626bb77849e5956ef2363d7d4a87.tar.xz
Roll back the shared library, r96559. It broke two darwins and arm, mysteriously.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@96569 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Unit')
-rw-r--r--test/Unit/lit.cfg9
-rw-r--r--test/Unit/lit.site.cfg.in2
2 files changed, 1 insertions, 10 deletions
diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg
index 5fe07324a1..34372bb6cb 100644
--- a/test/Unit/lit.cfg
+++ b/test/Unit/lit.cfg
@@ -23,14 +23,7 @@ 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
- config.environment[config.shlibpath_var] = shlibpath
+import os
# 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 51b5bc416f..c190ffa68e 100644
--- a/test/Unit/lit.site.cfg.in
+++ b/test/Unit/lit.site.cfg.in
@@ -5,8 +5,6 @@ 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")