Andreas Stieger
33988ce299
- use svnserveautocheck.sh and davautocheck.sh for unit tests, greatly reducing complexity of spec file and adding support for running unit tests with httpd 2.4 in factory - add subversion-1.7.9-davautocheck-LD_LIBRARY_PATH.patch to not overwrite LD_LIBRARY_PATH in davautocheck.sh to make auth-test pass OBS-URL: https://build.opensuse.org/request/show/176300 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=119
49 lines
2.7 KiB
Diff
49 lines
2.7 KiB
Diff
From: Andreas Stieger <andreas.stieger@gmx.de>
|
|
Date: 2013-05-21 17:43:00 +0100
|
|
Subject: [PATCH] do not clear LD_LIBRARY_PATH in davautocheck.sh
|
|
Upstream: merged
|
|
References: http://svn.apache.org/viewvc?view=revision&revision=1197065
|
|
|
|
During "make check", auth-test loads DSOs at runtime and cannot find them
|
|
unless LD_LIBRARY_PATH inlucdes subversion/libsvn_auth_kwallet/.libs and
|
|
/subversion/libsvn_auth_gnome_keyring/.libs.
|
|
|
|
Adjust davautocheck.sh so that LD_LIBRARY_PATH is prepended to rather
|
|
than overwritten so that the spec file can set the required paths for
|
|
the auth-tests to pass.
|
|
|
|
Actually then found to have been fixed in the trunk in r1197065. Required
|
|
for unit tests with 1.7.x but not 1.8.x
|
|
|
|
---
|
|
subversion/tests/cmdline/dav-mirror-autocheck.sh | 2 +-
|
|
subversion/tests/cmdline/davautocheck.sh | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
Index: subversion-1.7.9/subversion/tests/cmdline/dav-mirror-autocheck.sh
|
|
===================================================================
|
|
--- subversion-1.7.9.orig/subversion/tests/cmdline/dav-mirror-autocheck.sh 2011-04-21 12:42:32.000000000 +0100
|
|
+++ subversion-1.7.9/subversion/tests/cmdline/dav-mirror-autocheck.sh 2013-05-21 20:32:40.000000000 +0100
|
|
@@ -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"}"
|
|
Index: subversion-1.7.9/subversion/tests/cmdline/davautocheck.sh
|
|
===================================================================
|
|
--- subversion-1.7.9.orig/subversion/tests/cmdline/davautocheck.sh 2012-05-13 05:03:03.000000000 +0100
|
|
+++ subversion-1.7.9/subversion/tests/cmdline/davautocheck.sh 2013-05-21 20:32:40.000000000 +0100
|
|
@@ -198,7 +198,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'
|