Skip to content

Commit 5536934

Browse files
avargitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d8faea9 commit 5536934

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

t/lib-git-svn.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ fi
1616
GIT_DIR=$PWD/.git
1717
GIT_SVN_DIR=$GIT_DIR/svn/refs/remotes/git-svn
1818
SVN_TREE=$GIT_SVN_DIR/svn-tree
19-
PERL=${PERL:-perl}
2019

2120
svn >/dev/null 2>&1
2221
if test $? -ne 1
@@ -30,7 +29,7 @@ export svnrepo
3029
svnconf=$PWD/svnconf
3130
export svnconf
3231

33-
$PERL -w -e "
32+
"$PERL_PATH" -w -e "
3433
use SVN::Core;
3534
use SVN::Repos;
3635
\$SVN::Core::VERSION gt '1.1.0' or exit(42);
@@ -130,7 +129,7 @@ stop_httpd () {
130129
}
131130

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

0 commit comments

Comments
 (0)