svn commit: r1197065 - in /subversion/trunk/subversion/tests/cmdline: dav-mirror-autocheck.sh davautocheck.sh

[ju...@apache.org]

Author: julianfoad
Date: Thu Nov  3 11:16:53 2011
New Revision: 1197065

URL: http://svn.apache.org/viewvc?rev=1197065&view=rev
Log:
Fix a test failure when when building with extra auth methods such as Gnome
keyring and testing with 'davautocheck'. The symptom is that auth-test 1
reports an error such as 'svn_auth_get_platform_specific_client_providers
should return an array of 3 providers'.

Pass the user's LD_LIBRARY_PATH environment variable through "make
davautocheck" to the "make check" that it calls. This enables, for
example, a path to the dynamically loaded KWallet or Gnome-keyring libraries
to be specified with "make svnserveautocheck" as it can with "make check".
And the same for dav-mirror-autocheck.sh.

This is a follow-up to r879899 which did the same for svnserveautocheck.sh.

Found by: Jonathan Nieder <jrnieder{_AT_}gmail.com>

* subversion/tests/cmdline/davautocheck.sh,
  subversion/tests/cmdline/dav-mirror-autocheck.sh
  Insert extra directories at the beginning of the caller's LD_LIBRARY_PATH
  value instead of replacing the caller's value.

Modified:
    subversion/trunk/subversion/tests/cmdline/dav-mirror-autocheck.sh
    subversion/trunk/subversion/tests/cmdline/davautocheck.sh

Modified: subversion/trunk/subversion/tests/cmdline/dav-mirror-autocheck.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/dav-mirror-autocheck.sh?rev=1197065&r1=1197064&r2=1197065&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/dav-mirror-autocheck.sh (original)
+++ subversion/trunk/subversion/tests/cmdline/dav-mirror-autocheck.sh Thu Nov  3 11:16:53 2011
@@ -323,7 +323,7 @@ fi
 [ -r "$MOD_AUTHZ_SVN" ] \
   || fail "authz_svn_module not found, please use '--enable-shared --enable-dso --with-apxs' with your 'configure' script"
 
-export LD_LIBRARY_PATH="$ABS_BUILDDIR/subversion/libsvn_ra_neon/.libs:$ABS_BUILDDIR/subversion/libsvn_ra_local/.libs:$ABS_BUILDDIR/subversion/libsvn_ra_svn/.libs"
+export 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"
 
 MASTER_REPOS="${MASTER_REPOS:-"$HTTPD_ROOT/master_repos"}"
 SLAVE_REPOS="${SLAVE_REPOS:-"$HTTPD_ROOT/slave_repos"}"

Modified: subversion/trunk/subversion/tests/cmdline/davautocheck.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/davautocheck.sh?rev=1197065&r1=1197064&r2=1197065&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/trunk/subversion/tests/cmdline/davautocheck.sh Thu Nov  3 11:16:53 2011
@@ -195,7 +195,7 @@ fi
 [ -r "$MOD_AUTHZ_SVN" ] \
   || fail "authz_svn_module not found, please use '--enable-shared --enable-dso --with-apxs' with your 'configure' script"
 
-export LD_LIBRARY_PATH="$ABS_BUILDDIR/subversion/libsvn_ra_neon/.libs:$ABS_BUILDDIR/subversion/libsvn_ra_local/.libs:$ABS_BUILDDIR/subversion/libsvn_ra_svn/.libs"
+export 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"
 
 case "`uname`" in
   Darwin*) LDD='otool -L'