From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Jul 2012 19:59:56 +0000 (-0700)
Subject: Merge branch 'vr/use-our-perl-in-tests' into maint
X-Git-Tag: v1.7.11.3~11
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bb3ed291a6cfd4ed58773f2158f3ae32baf066e0?ds=inline;hp=-c

Merge branch 'vr/use-our-perl-in-tests' into maint

Some implementations of Perl terminates "lines" with CRLF even when
the script is operating on just a sequence of bytes.  Make sure to
use "$PERL_PATH", the version of Perl the user told Git to use, in
our tests to avoid unnecessary breakages in tests.

* vr/use-our-perl-in-tests:
t/README: add a bit more Don'ts
tests: enclose $PERL_PATH in double quotes
t/test-lib.sh: export PERL_PATH for use in scripts
t: Replace 'perl' by $PERL_PATH
---

bb3ed291a6cfd4ed58773f2158f3ae32baf066e0
diff --combined t/t9300-fast-import.sh
index c17f52e586,11f977bec2..2fcf269469
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@@ -12,7 -12,7 +12,7 @@@ test_description='test git fast-import 
  # This could be written as "head -c $1", but IRIX "head" does not
  # support the -c option.
  head_c () {
- 	perl -e '
+ 	"$PERL_PATH" -e '
  		my $len = $ARGV[1];
  		while ($len > 0) {
  			my $s;
@@@ -2117,7 -2117,7 +2117,7 @@@ test_expect_success 
      grep :1 git.marks'
  
  test_expect_success \
 -    'R: export-marks options can be overriden by commandline options' \
 +    'R: export-marks options can be overridden by commandline options' \
      'cat input | git fast-import --export-marks=other.marks &&
      grep :1 other.marks'