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/t4020-diff-external.sh | |
| parent | Git 1.7.11-rc3 (diff) | |
| download | tgif-a3428205e6d74542d6441baaa29d1cb1d1064d95.tar.xz | |
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/t4020-diff-external.sh')
| -rwxr-xr-x | t/t4020-diff-external.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh index 083f62d1d6..3d9307b25e 100755 --- a/t/t4020-diff-external.sh +++ b/t/t4020-diff-external.sh @@ -118,7 +118,7 @@ test_expect_success 'no diff with -diff' ' git diff | grep Binary ' -echo NULZbetweenZwords | perl -pe 'y/Z/\000/' > file +echo NULZbetweenZwords | $PERL_PATH -pe 'y/Z/\000/' > file test_expect_success 'force diff with "diff"' ' echo >.gitattributes "file diff" && |