Browse Source

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>
maint
Eric Wong 18 years ago committed by Junio C Hamano
parent
commit
e66191f483
  1. 5
      t/lib-git-svn.sh
  2. 1
      t/t9104-git-svn-follow-parent.sh

5
t/lib-git-svn.sh

@ -25,14 +25,15 @@ perl -w -e "
use SVN::Core; use SVN::Core;
use SVN::Repos; use SVN::Repos;
\$SVN::Core::VERSION gt '1.1.0' or exit(42); \$SVN::Core::VERSION gt '1.1.0' or exit(42);
SVN::Repos::create('$svnrepo', undef, undef, undef, system(qw/svnadmin create --fs-type fsfs/, '$svnrepo') == 0 or exit(41);
{ 'fs-config' => 'fsfs'});
" "
x=$? x=$?
if test $x -ne 0 if test $x -ne 0
then then
if test $x -eq 42; then if test $x -eq 42; then
err='Perl SVN libraries must be >= 1.1.0' err='Perl SVN libraries must be >= 1.1.0'
elif test $x -eq 41; then
err='svnadmin failed to create fsfs repository'
else else
err='Perl SVN libraries not found or unusable, skipping test' err='Perl SVN libraries not found or unusable, skipping test'
fi fi

1
t/t9104-git-svn-follow-parent.sh

@ -17,6 +17,7 @@ test_expect_success 'initialize repo' "
cd wc && cd wc &&
echo world >> trunk/readme && echo world >> trunk/readme &&
svn commit -m 'another commit' && svn commit -m 'another commit' &&
svn up &&
svn mv -m 'rename to thunk' trunk thunk && svn mv -m 'rename to thunk' trunk thunk &&
svn up && svn up &&
echo goodbye >> thunk/readme && echo goodbye >> thunk/readme &&

Loading…
Cancel
Save