mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t/lib-git-svn.sh: use $PERL_PATH for perl, not perl from $PATH

Browse Source 
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>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2010-08-10 12:14:25 +00:00
committed by Junio C Hamano
parent d8faea9d18
commit 5536934239
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
t/lib-git-svn.sh
View File

@ -16,7 +16,6 @@ fi
GIT_DIR=$PWD/.git GIT_DIR=$PWD/.git
GIT_SVN_DIR=$GIT_DIR/svn/refs/remotes/git-svn GIT_SVN_DIR=$GIT_DIR/svn/refs/remotes/git-svn
SVN_TREE=$GIT_SVN_DIR/svn-tree SVN_TREE=$GIT_SVN_DIR/svn-tree
PERL=${PERL:-perl}
svn >/dev/null 2>&1 svn >/dev/null 2>&1
if test $? -ne 1 if test $? -ne 1
@ -30,7 +29,7 @@ export svnrepo
svnconf=$PWD/svnconf svnconf=$PWD/svnconf
export svnconf export svnconf
$PERL -w -e " "$PERL_PATH" -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);
@ -130,7 +129,7 @@ stop_httpd () {
} }
convert_to_rev_db () { convert_to_rev_db () {
$PERL -w -- - "$@" <<\EOF "$PERL_PATH" -w -- - "$@" <<\EOF
use strict; use strict;
@ARGV == 2 or die "Usage: convert_to_rev_db <input> <output>"; @ARGV == 2 or die "Usage: convert_to_rev_db <input> <output>";
open my $wr, '+>', $ARGV[1] or die "$!: couldn't open: $ARGV[1]"; open my $wr, '+>', $ARGV[1] or die "$!: couldn't open: $ARGV[1]";