diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-22 12:59:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-22 12:59:56 -0700 |
| commit | bb3ed291a6cfd4ed58773f2158f3ae32baf066e0 (patch) | |
| tree | 9d8281ef421c7ee7d71426954fd9c829e803d5b6 /t/t4103-apply-binary.sh | |
| parent | 8d141a1d562abb31f27f599dbf6e10a6c06ed73e (diff) | |
| parent | ad78585eeebd8d5ac596ad4f06f549734ce9d870 (diff) | |
| download | git-bb3ed291a6cfd4ed58773f2158f3ae32baf066e0.tar.gz git-bb3ed291a6cfd4ed58773f2158f3ae32baf066e0.tar.xz | |
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
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 dbbf56cba..99627bc6d 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' && |