Skip to content

Commit

Permalink
t/lib-git-svn.sh: use $PERL_PATH for perl, not perl from $PATH
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
avar authored and gitster committed Aug 11, 2010
1 parent d8faea9 commit 5536934
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions t/lib-git-svn.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ fi
GIT_DIR=$PWD/.git
GIT_SVN_DIR=$GIT_DIR/svn/refs/remotes/git-svn
SVN_TREE=$GIT_SVN_DIR/svn-tree
PERL=${PERL:-perl}

svn >/dev/null 2>&1
if test $? -ne 1
Expand All @@ -30,7 +29,7 @@ export svnrepo
svnconf=$PWD/svnconf
export svnconf

$PERL -w -e "
"$PERL_PATH" -w -e "
use SVN::Core;
use SVN::Repos;
\$SVN::Core::VERSION gt '1.1.0' or exit(42);
Expand Down Expand Up @@ -130,7 +129,7 @@ stop_httpd () {
}

convert_to_rev_db () {
$PERL -w -- - "$@" <<\EOF
"$PERL_PATH" -w -- - "$@" <<\EOF
use strict;
@ARGV == 2 or die "Usage: convert_to_rev_db <input> <output>";
open my $wr, '+>', $ARGV[1] or die "$!: couldn't open: $ARGV[1]";
Expand Down

0 comments on commit 5536934

Please sign in to comment.