threads / patch / 24690

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

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

## tl;dr

3 messages between Aug 10, 2010 and Aug 11, 2010. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Ævar Arnfjörð Bjarmason· Aug 10, 2010, 12:14 UTC · lore
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>
---
 t/lib-git-svn.sh |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
Show changes to t/lib-git-svn.sh +2 −3
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index c3f6676..92d6d31 100644
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -16,7 +16,6 @@ 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
@@ -30,7 +29,7 @@ export svnrepo
 svnconf=$PWD/svnconf
 export svnconf
 
-$PERL -w -e "
+"$PERL_PATH" -w -e "
 use SVN::Core;
 use SVN::Repos;
 \$SVN::Core::VERSION gt '1.1.0' or exit(42);
@@ -130,7 +129,7 @@ stop_httpd () {
 }
 
 convert_to_rev_db () {
-	$PERL -w -- - "$@" <<\EOF
+	"$PERL_PATH" -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]";

-- 
1.7.1
Ævar Arnfjörð Bjarmason· Aug 11, 2010, 18:45 UTC · re: Junio C Hamano · lore

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

On Wed, Aug 11, 2010 at 18:32, Junio C Hamano <gitster@pobox.com> wrote:
> Thanks.  Other test scripts (and the insn in t/README) refer to PERL_PATH
> already and t/test-lib.sh includes build options for its definition, so
> this should be complete.
There's actually a lot more (most of these):
    $ ack -l '\bperl.*-\w*e' *sh
    annotate-tests.sh
    diff-lib.sh
    gitweb-lib.sh
    lib-t6000.sh
    t1010-mktree.sh
    t1300-repo-config.sh
    t3300-funny-names.sh
    t4012-diff-binary.sh
    t4014-format-patch.sh
    t4020-diff-external.sh
    t4029-diff-trailing-space.sh
    t4030-diff-textconv.sh
    t4031-diff-rewrite-binary.sh
    t4103-apply-binary.sh
    t4116-apply-reverse.sh
    t4200-rerere.sh
    t5300-pack-object.sh
    t5303-pack-corruption-resilience.sh
    t6011-rev-list-with-bad-commit.sh
    t6013-rev-list-reverse-parents.sh
    t6300-for-each-ref.sh
    t9104-git-svn-follow-parent.sh
    t9119-git-svn-info.sh
    t9129-git-svn-i18n-commitencoding.sh
    t9137-git-svn-dcommit-clobber-series.sh
    t9143-git-svn-gc.sh
    test-lib.sh

But they're all using standard features of perl for one-liners. It's a reasonable assumption that we can use the perl in $PATH in those cases. But maybe we should change those too.

← back to recent threads