t/lib-git-svn.sh: use $PERL_PATH for perl, not perl from $PATH
Change the git-svn tests to use $PERL_PATH, not the "perl" in $PATH. Using perl in $PATH was added by Sam Vilain in v1.6.6-rc0~95^2~3, Philippe Bruhat introduced $PERL_PATH to the test suite in v1.6.6-rc0~9^2, but the lib-git-svn.sh tests weren't updated to use the new convention. This resulted in the git-svn tests always being skipped on my system. My /usr/bin/perl has access to SVN::Core and SVN::Repos, but the perl in my $PATH does not. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Aug 10, 2010 at 12:14 UTC
5536934239ed0a66fc5ac1d08cfd7e6a0905f80c
1 file changed
+2
-3
t/lib-git-svn.sh
+2
-3
@@ -16,7 +16,6 @@ fi
16
GIT_DIR=$PWD/.git
17
GIT_SVN_DIR=$GIT_DIR/svn/refs/remotes/git-svn
18
SVN_TREE=$GIT_SVN_DIR/svn-tree
19
-PERL=${PERL:-perl}
19
20
svn >/dev/null 2>&1
21
if test $? -ne 1
@@ -30,7 +29,7 @@ export svnrepo
29
svnconf=$PWD/svnconf
30
export svnconf
31
33
-$PERL -w -e "
32
+"$PERL_PATH" -w -e "
33
use SVN::Core;
34
use SVN::Repos;
35
\$SVN::Core::VERSION gt '1.1.0' or exit(42);
@@ -130,7 +129,7 @@ stop_httpd () {
129
}
130
131
convert_to_rev_db () {
133
- $PERL -w -- - "$@" <<\EOF
132
+ "$PERL_PATH" -w -- - "$@" <<\EOF
133
use strict;
134
@ARGV == 2 or die "Usage: convert_to_rev_db <input> <output>";
135
open my $wr, '+>', $ARGV[1] or die "$!: couldn't open: $ARGV[1]";