summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Sam Vilain <sam.vilain@catalyst.net.nz>2009-10-20 15:42:00 +1300
committerLibravatar Eric Wong <normalperson@yhbt.net>2009-10-26 23:49:02 -0700
commita5e9c7dfe4732b560ab5dfc75e718bfda2027990 (patch)
treeb85ee5ad1f286070a9ad30e0db10f414a5b5cc5e
parentgit-svn: add test data for SVK merge, with script. (diff)
downloadtgif-a5e9c7dfe4732b560ab5dfc75e718bfda2027990.tar.xz
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>
-rw-r--r--t/lib-git-svn.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index fd8631f906..0f7f35ccc9 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]";