@matheusbsbs / matheus-bagliano / commits / e66191f483
Fork 0

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>

Eric Wong committed Jan 13, 2007 at 02:47 UTC e66191f4837f2d18bb70ceaf3cad4eb52cc4000c
2 files changed +4 -2
t/lib-git-svn.sh
+3 -2
@@ -25,14 +25,15 @@ perl -w -e "
25 use SVN::Core;
26 use SVN::Repos;
27 \$SVN::Core::VERSION gt '1.1.0' or exit(42);
28 -SVN::Repos::create('$svnrepo', undef, undef, undef,
29 - { 'fs-config' => 'fsfs'});
28 +system(qw/svnadmin create --fs-type fsfs/, '$svnrepo') == 0 or exit(41);
29 "
30 x=$?
31 if test $x -ne 0
32 then
33 if test $x -eq 42; then
34 err='Perl SVN libraries must be >= 1.1.0'
35 + elif test $x -eq 41; then
36 + err='svnadmin failed to create fsfs repository'
37 else
38 err='Perl SVN libraries not found or unusable, skipping test'
39 fi
t/t9104-git-svn-follow-parent.sh
+1
@@ -17,6 +17,7 @@ test_expect_success 'initialize repo' "
17 cd wc &&
18 echo world >> trunk/readme &&
19 svn commit -m 'another commit' &&
20 + svn up &&
21 svn mv -m 'rename to thunk' trunk thunk &&
22 svn up &&
23 echo goodbye >> thunk/readme &&