Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-svn: allow test setup script to support PERL env. var
author
Sam Vilain
<sam.vilain@catalyst.net.nz>
Tue, 20 Oct 2009 02:42:00 +0000
(15:42 +1300)
committer
Eric Wong
<normalperson@yhbt.net>
Tue, 27 Oct 2009 06:49:02 +0000
(23:49 -0700)
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>
t/lib-git-svn.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
cb74a0c
)
diff --git
a/t/lib-git-svn.sh
b/t/lib-git-svn.sh
index fd8631f90686bb4dfe6d39290434136fc4741068..0f7f35ccc9e1315d3ac8e5d37df51c106847d920 100644
(file)
--- 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
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
svn >/dev/null 2>&1
if test $? -ne 1
@@
-29,7
+30,7
@@
export svnrepo
svnconf=$PWD/svnconf
export svnconf
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);
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 () {
}
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]";
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]";