aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2007-01-13 02:47:53 -0800
committerJunio C Hamano <junkio@cox.net>2007-01-13 10:03:04 -0800
commite66191f4837f2d18bb70ceaf3cad4eb52cc4000c (patch)
tree866869d4d35deec0aad7d4fe209d6f3b952004ff /t
parentb60daf0515889ca75f88f1d4d49a6a9c4117ba36 (diff)
downloadgit-e66191f4837f2d18bb70ceaf3cad4eb52cc4000c.tar.gz
git-e66191f4837f2d18bb70ceaf3cad4eb52cc4000c.tar.xz
git-svn: fix tests to work with older svn
Some of the recent changes and shortcuts to the tests broke things for people using older versions of svn: t9104-git-svn-follow-parent.sh: v1.2.3 (from SuSE 10.0 as reported by riddochc on #git (thanks!)) required an extra 'svn up'. I was also able to reproduce this with v1.1.4 (Debian Sarge). lib-git-svn.sh: SVN::Repos bindings in versions up to and including 1.1.4 (Sarge again) do not pass fs-config options to the underlying library. BerkeleyDB repositories also seem completely broken on all my Sarge machines; so not using FSFS does not seem to be an option for most people. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
-rw-r--r--t/lib-git-svn.sh5
-rwxr-xr-xt/t9104-git-svn-follow-parent.sh1
2 files changed, 4 insertions, 2 deletions
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index af42ccc8d..a0f281408 100644
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -25,14 +25,15 @@ perl -w -e "
use SVN::Core;
use SVN::Repos;
\$SVN::Core::VERSION gt '1.1.0' or exit(42);
-SVN::Repos::create('$svnrepo', undef, undef, undef,
- { 'fs-config' => 'fsfs'});
+system(qw/svnadmin create --fs-type fsfs/, '$svnrepo') == 0 or exit(41);
"
x=$?
if test $x -ne 0
then
if test $x -eq 42; then
err='Perl SVN libraries must be >= 1.1.0'
+ elif test $x -eq 41; then
+ err='svnadmin failed to create fsfs repository'
else
err='Perl SVN libraries not found or unusable, skipping test'
fi
diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index 400c21cd4..8d2e2fec3 100755
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -17,6 +17,7 @@ test_expect_success 'initialize repo' "
cd wc &&
echo world >> trunk/readme &&
svn commit -m 'another commit' &&
+ svn up &&
svn mv -m 'rename to thunk' trunk thunk &&
svn up &&
echo goodbye >> thunk/readme &&