You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2012/12/13 23:34:08 UTC

svn commit: r1421583 - /subversion/trunk/subversion/tests/cmdline/davautocheck.sh

Author: breser
Date: Thu Dec 13 22:34:06 2012
New Revision: 1421583

URL: http://svn.apache.org/viewvc?rev=1421583&view=rev
Log:
Make davautocheck work for OS X.

rpath support on OS X doesn't help us as much as it does on other platforms,
since it's trivial to be more explicit about this for all platforms go ahead
and do so.

* subversion/tests/cmdline/davautocheck.sh
  Iterate and build all the .libs paths for the DYLD_LIBRARY_PATH env variable.


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=1421583&r1=1421582&r2=1421583&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/trunk/subversion/tests/cmdline/davautocheck.sh Thu Dec 13 22:34:06 2012
@@ -219,7 +219,13 @@ fi
 [ -r "$MOD_AUTHZ_SVN" ] \
   || fail "authz_svn_module not found, please use '--enable-shared --enable-dso --with-apxs' with your 'configure' script"
 
-BUILDDIR_LIBRARY_PATH="$ABS_BUILDDIR/subversion/libsvn_ra_neon/.libs:$ABS_BUILDDIR/subversion/libsvn_ra_local/.libs:$ABS_BUILDDIR/subversion/libsvn_ra_svn/.libs"
+for d in `find "$ABS_BUILDDIR" -type d -name .libs`; do
+  if [ -z "$BUILDDIR_LIBRARY_PATH" ]; then
+    BUILDDIR_LIBRARY_PATH="$d"
+  else
+    BUILDDIR_LIBRARY_PATH="$BUILDDIR_LIBRARY_PATH:$d"
+  fi
+done
 
 case "`uname`" in
   Darwin*)

Re: svn commit: r1421583 - /subversion/trunk/subversion/tests/cmdline/davautocheck.sh

Posted by Ben Reser <be...@reser.org>.
On Fri, Dec 14, 2012 at 1:39 PM, Daniel Shahaf <da...@elego.de> wrote:
> -maxdepth please?  So it doesn't recurse into svn-test-work.
>
> It might be better to be explicit:
>
> "$ABS_BUILDDIR"/subversion/*/.libs/

Yeah my find was overzealous.

Committed your last suggestion in r1422141

Re: svn commit: r1421583 - /subversion/trunk/subversion/tests/cmdline/davautocheck.sh

Posted by Ben Reser <be...@reser.org>.
On Fri, Dec 14, 2012 at 1:39 PM, Daniel Shahaf <da...@elego.de> wrote:
> -maxdepth please?  So it doesn't recurse into svn-test-work.
>
> It might be better to be explicit:
>
> "$ABS_BUILDDIR"/subversion/*/.libs/

Yeah my find was overzealous.

Committed your last suggestion in r1422141

Re: svn commit: r1421583 - /subversion/trunk/subversion/tests/cmdline/davautocheck.sh

Posted by Daniel Shahaf <da...@elego.de>.
breser@apache.org wrote on Thu, Dec 13, 2012 at 22:34:08 -0000:
> Author: breser
> Date: Thu Dec 13 22:34:06 2012
> New Revision: 1421583
> 
> URL: http://svn.apache.org/viewvc?rev=1421583&view=rev
> Log:
> Make davautocheck work for OS X.
> 
> rpath support on OS X doesn't help us as much as it does on other platforms,
> since it's trivial to be more explicit about this for all platforms go ahead
> and do so.
> 
> * subversion/tests/cmdline/davautocheck.sh
>   Iterate and build all the .libs paths for the DYLD_LIBRARY_PATH env variable.
> 
> 
> 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=1421583&r1=1421582&r2=1421583&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/tests/cmdline/davautocheck.sh (original)
> +++ subversion/trunk/subversion/tests/cmdline/davautocheck.sh Thu Dec 13 22:34:06 2012
> @@ -219,7 +219,13 @@ fi
>  [ -r "$MOD_AUTHZ_SVN" ] \
>    || fail "authz_svn_module not found, please use '--enable-shared --enable-dso --with-apxs' with your 'configure' script"
>  
> -BUILDDIR_LIBRARY_PATH="$ABS_BUILDDIR/subversion/libsvn_ra_neon/.libs:$ABS_BUILDDIR/subversion/libsvn_ra_local/.libs:$ABS_BUILDDIR/subversion/libsvn_ra_svn/.libs"
> +for d in `find "$ABS_BUILDDIR" -type d -name .libs`; do

-maxdepth please?  So it doesn't recurse into svn-test-work.

It might be better to be explicit:

"$ABS_BUILDDIR"/subversion/*/.libs/

> +  if [ -z "$BUILDDIR_LIBRARY_PATH" ]; then
> +    BUILDDIR_LIBRARY_PATH="$d"
> +  else
> +    BUILDDIR_LIBRARY_PATH="$BUILDDIR_LIBRARY_PATH:$d"
> +  fi
> +done
>  
>  case "`uname`" in
>    Darwin*)
> 
>

Re: svn commit: r1421583 - /subversion/trunk/subversion/tests/cmdline/davautocheck.sh

Posted by Daniel Shahaf <da...@elego.de>.
breser@apache.org wrote on Thu, Dec 13, 2012 at 22:34:08 -0000:
> Author: breser
> Date: Thu Dec 13 22:34:06 2012
> New Revision: 1421583
> 
> URL: http://svn.apache.org/viewvc?rev=1421583&view=rev
> Log:
> Make davautocheck work for OS X.
> 
> rpath support on OS X doesn't help us as much as it does on other platforms,
> since it's trivial to be more explicit about this for all platforms go ahead
> and do so.
> 
> * subversion/tests/cmdline/davautocheck.sh
>   Iterate and build all the .libs paths for the DYLD_LIBRARY_PATH env variable.
> 
> 
> 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=1421583&r1=1421582&r2=1421583&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/tests/cmdline/davautocheck.sh (original)
> +++ subversion/trunk/subversion/tests/cmdline/davautocheck.sh Thu Dec 13 22:34:06 2012
> @@ -219,7 +219,13 @@ fi
>  [ -r "$MOD_AUTHZ_SVN" ] \
>    || fail "authz_svn_module not found, please use '--enable-shared --enable-dso --with-apxs' with your 'configure' script"
>  
> -BUILDDIR_LIBRARY_PATH="$ABS_BUILDDIR/subversion/libsvn_ra_neon/.libs:$ABS_BUILDDIR/subversion/libsvn_ra_local/.libs:$ABS_BUILDDIR/subversion/libsvn_ra_svn/.libs"
> +for d in `find "$ABS_BUILDDIR" -type d -name .libs`; do

-maxdepth please?  So it doesn't recurse into svn-test-work.

It might be better to be explicit:

"$ABS_BUILDDIR"/subversion/*/.libs/

> +  if [ -z "$BUILDDIR_LIBRARY_PATH" ]; then
> +    BUILDDIR_LIBRARY_PATH="$d"
> +  else
> +    BUILDDIR_LIBRARY_PATH="$BUILDDIR_LIBRARY_PATH:$d"
> +  fi
> +done
>  
>  case "`uname`" in
>    Darwin*)
> 
>