subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1360337 - /subversion/trunk/subversion/tests/cmdline/davautocheck.sh
Date Wed, 11 Jul 2012 18:22:21 GMT
Author: brane
Date: Wed Jul 11 18:22:21 2012
New Revision: 1360337

URL: http://svn.apache.org/viewvc?rev=1360337&view=rev
Log:
Make davautocheck.sh properly set the library load path on Mac OS X.

* subversion/tests/cmdline/davautocheck.sh: Use DYLD_LIBRARY_PATH instead
  of LD_LIBRARY_PATH on Darwin.

Modified:
    subversion/trunk/subversion/tests/cmdline/davautocheck.sh

Modified: subversion/trunk/subversion/tests/cmdline/davautocheck.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/davautocheck.sh?rev=1360337&r1=1360336&r2=1360337&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/trunk/subversion/tests/cmdline/davautocheck.sh Wed Jul 11 18:22:21 2012
@@ -219,13 +219,18 @@ fi
 [ -r "$MOD_AUTHZ_SVN" ] \
   || fail "authz_svn_module not found, please use '--enable-shared --enable-dso --with-apxs'
with your 'configure' script"
 
-LD_LIBRARY_PATH="$ABS_BUILDDIR/subversion/libsvn_ra_neon/.libs:$ABS_BUILDDIR/subversion/libsvn_ra_local/.libs:$ABS_BUILDDIR/subversion/libsvn_ra_svn/.libs:$LD_LIBRARY_PATH"
-export LD_LIBRARY_PATH
+BUILDDIR_LIBRARY_PATH="$ABS_BUILDDIR/subversion/libsvn_ra_neon/.libs:$ABS_BUILDDIR/subversion/libsvn_ra_local/.libs:$ABS_BUILDDIR/subversion/libsvn_ra_svn/.libs"
 
 case "`uname`" in
-  Darwin*) LDD='otool -L'
+  Darwin*)
+    LDD='otool -L'
+    DYLD_LIBRARY_PATH="$BUILDDIR_LIBRARY_PATH:$DYLD_LIBRARY_PATH"
+    export DYLD_LIBRARY_PATH
     ;;
-  *) LDD='ldd'
+  *)
+    LDD='ldd'
+    LD_LIBRARY_PATH="$BUILDDIR_LIBRARY_PATH:$LD_LIBRARY_PATH"
+    export LD_LIBRARY_PATH
     ;;
 esac
 



Mime
View raw message