From: Sam Vilain <sam.vilain@catalyst.net.nz>
Date: Tue, 20 Oct 2009 02:42:00 +0000 (+1300)
Subject: git-svn: allow test setup script to support PERL env. var
X-Git-Tag: v1.6.6-rc0~95^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a5e9c7dfe4732b560ab5dfc75e718bfda2027990;p=git.git

git-svn: allow test setup script to support PERL env. var

Possibly the 'perl' in the PATH is not the one to be used for the tests;
let PERL set in the environment select it.

Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz>
Acked-by: Eric Wong <normalperson@yhbt.net>
---

diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index fd8631f90..0f7f35ccc 100644
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -16,6 +16,7 @@ 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
@@ -29,7 +30,7 @@ export svnrepo
 svnconf=$PWD/svnconf
 export svnconf
 
-perl -w -e "
+$PERL -w -e "
 use SVN::Core;
 use SVN::Repos;
 \$SVN::Core::VERSION gt '1.1.0' or exit(42);
@@ -130,7 +131,7 @@ stop_httpd () {
 }
 
 convert_to_rev_db () {
-	perl -w -- - "$@" <<\EOF
+	$PERL -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]";