From 407fbdd161d4134901fefe267779a4aaaeab2f0d Mon Sep 17 00:00:00 2001 From: Jeffrey Yasskin Date: Tue, 23 Feb 2010 20:53:37 +0000 Subject: Roll back r96959 again. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@96981 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Unit/lit.cfg | 9 +-------- test/Unit/lit.site.cfg.in | 2 -- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'test/Unit') diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg index 5fe0732..34372bb 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 51b5bc4..c190ffa 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") -- cgit v1.1