[llvm-commits] [llvm] r120274 - in /llvm/trunk/test: CMakeLists.txt Makefile Unit/lit.cfg Unit/lit.site.cfg.in lit.cfg site.exp.in

[NAKAMURA Takumi]

Author: chapuni
Date: Sun Nov 28 18:20:21 2010
New Revision: 120274

URL: http://llvm.org/viewvc/llvm-project?rev=120274&view=rev
Log:
test: Use $SharedLibDir for loadable modules. On Cygming, loadable modules are not in lib/ but bin.

Modified:
    llvm/trunk/test/CMakeLists.txt
    llvm/trunk/test/Makefile
    llvm/trunk/test/Unit/lit.cfg
    llvm/trunk/test/Unit/lit.site.cfg.in
    llvm/trunk/test/lit.cfg
    llvm/trunk/test/site.exp.in

Modified: llvm/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CMakeLists.txt?rev=120274&r1=120273&r2=120274&view=diff
==============================================================================
--- llvm/trunk/test/CMakeLists.txt (original)
+++ llvm/trunk/test/CMakeLists.txt Sun Nov 28 18:20:21 2010
@@ -7,6 +7,8 @@
 set(LLVM_LIBS_DIR "${LLVM_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}")
 set(SHLIBEXT "${LTDL_SHLIB_EXT}")
 
+set(SHLIBDIR "${LLVM_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}")
+
 if(BUILD_SHARED_LIBS)
   set(LLVM_SHARED_LIBS_ENABLED "1")
 else()

Modified: llvm/trunk/test/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Makefile?rev=120274&r1=120273&r2=120274&view=diff
==============================================================================
--- llvm/trunk/test/Makefile (original)
+++ llvm/trunk/test/Makefile Sun Nov 28 18:20:21 2010
@@ -143,6 +143,7 @@
 	@echo 'set llvmgcc_langs "$(LLVMGCC_LANGS)"' >> site.tmp
 	@echo 'set llvmtoolsdir "$(ToolDir)"' >>site.tmp
 	@echo 'set llvmlibsdir "$(LibDir)"' >>site.tmp
+	@echo 'set llvmshlibdir "$(SharedLibDir)"' >>site.tmp
 	@echo 'set llvm_bindings "$(BINDINGS_TO_BUILD)"' >> site.tmp
 	@echo 'set srcroot "$(LLVM_SRC_ROOT)"' >>site.tmp
 	@echo 'set objroot "$(LLVM_OBJ_ROOT)"' >>site.tmp
@@ -187,6 +188,7 @@
 	     -e "s#@LLVMGCCDIR@#$(LLVMGCCDIR)#g" \
 	     -e "s#@LLVM_BUILD_MODE@#$(BuildMode)#g" \
 	     -e "s#@ENABLE_SHARED@#$(ENABLE_SHARED)#g" \
+	     -e "s#@SHLIBDIR@#$(SharedLibDir)#g" \
 	     -e "s#@SHLIBPATH_VAR@#$(SHLIBPATH_VAR)#g" \
 	     $(PROJ_SRC_DIR)/Unit/lit.site.cfg.in > $@
 

Modified: llvm/trunk/test/Unit/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Unit/lit.cfg?rev=120274&r1=120273&r2=120274&view=diff
==============================================================================
--- llvm/trunk/test/Unit/lit.cfg (original)
+++ llvm/trunk/test/Unit/lit.cfg Sun Nov 28 18:20:21 2010
@@ -25,11 +25,10 @@
 
 # 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.

Modified: llvm/trunk/test/Unit/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Unit/lit.site.cfg.in?rev=120274&r1=120273&r2=120274&view=diff
==============================================================================
--- llvm/trunk/test/Unit/lit.site.cfg.in (original)
+++ llvm/trunk/test/Unit/lit.site.cfg.in Sun Nov 28 18:20:21 2010
@@ -6,6 +6,7 @@
 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.

Modified: llvm/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lit.cfg?rev=120274&r1=120273&r2=120274&view=diff
==============================================================================
--- llvm/trunk/test/lit.cfg (original)
+++ llvm/trunk/test/lit.cfg Sun Nov 28 18:20:21 2010
@@ -128,6 +128,7 @@
 config.substitutions.append(('%llvmgcc_only', site_exp['llvmgcc']))
 for sub in ['llvmgcc', 'llvmgxx', 'emitir', 'compile_cxx', 'compile_c',
             'link', 'shlibext', 'ocamlopt', 'llvmdsymutil', 'llvmlibsdir',
+            'llvmshlibdir',
             'bugpoint_topts']:
     if sub in ('llvmgcc', 'llvmgxx'):
         config.substitutions.append(('%' + sub,

Modified: llvm/trunk/test/site.exp.in
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/site.exp.in?rev=120274&r1=120273&r2=120274&view=diff
==============================================================================
--- llvm/trunk/test/site.exp.in (original)
+++ llvm/trunk/test/site.exp.in Sun Nov 28 18:20:21 2010
@@ -5,6 +5,7 @@
 set llvmgcc_langs "@LLVMGCC_LANGS@"
 set llvmtoolsdir "@LLVM_TOOLS_DIR@"
 set llvmlibsdir "@LLVM_LIBS_DIR@"
+set llvmshlibdir "@SHLIBDIR@"
 set llvm_bindings "@LLVM_BINDINGS@"
 set srcroot "@LLVM_SOURCE_DIR@"
 set objroot "@LLVM_BINARY_DIR@"