diff options
| author | Vincent van Ravesteijn <vfr@lyx.org> | 2012-06-11 19:01:53 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-12 09:30:41 -0700 |
| commit | a3428205e6d74542d6441baaa29d1cb1d1064d95 (patch) | |
| tree | 0ee104bbd1c619f46234d342fb6774f44b2f26c8 /t/t4103-apply-binary.sh | |
| parent | 9bea2b5896701cf952f75c8f6756656cd3c40af0 (diff) | |
| download | git-a3428205e6d74542d6441baaa29d1cb1d1064d95.tar.gz | |
t: Replace 'perl' by $PERL_PATH
GIT-BUILD-OPTIONS defines PERL_PATH to be used in the test suite. Only a
few tests already actually use this variable when perl is needed. The
other test just call 'perl' and it might happen that the wrong perl
interpreter is used.
This becomes problematic on Windows, when the perl interpreter that is
compiled and installed on the Windows system is used, because this perl
interpreter might introduce some unexpected LF->CRLF conversions.
This patch makes sure that $PERL_PATH is used everywhere in the test suite
and that the correct perl interpreter is used.
Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4103-apply-binary.sh')
| -rwxr-xr-x | t/t4103-apply-binary.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4103-apply-binary.sh b/t/t4103-apply-binary.sh index dbbf56cba9..5b533cf939 100755 --- a/t/t4103-apply-binary.sh +++ b/t/t4103-apply-binary.sh @@ -25,10 +25,10 @@ test_expect_success 'setup' " git commit -m 'Initial Version' 2>/dev/null && git checkout -b binary && - perl -pe 'y/x/\000/' <file1 >file3 && + $PERL_PATH -pe 'y/x/\000/' <file1 >file3 && cat file3 >file4 && git add file2 && - perl -pe 'y/\000/v/' <file3 >file1 && + $PERL_PATH -pe 'y/\000/v/' <file3 >file1 && rm -f file2 && git update-index --add --remove file1 file2 file3 file4 && git commit -m 'Second Version' && |