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/t4200-rerere.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/t4200-rerere.sh')
| -rwxr-xr-x | t/t4200-rerere.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index 36255d608a..ec7622cbef 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -78,7 +78,7 @@ test_expect_success 'activate rerere, old style (conflicting merge)' ' test_might_fail git config --unset rerere.enabled && test_must_fail git merge first && - sha1=$(perl -pe "s/ .*//" .git/MERGE_RR) && + sha1=$($PERL_PATH -pe "s/ .*//" .git/MERGE_RR) && rr=.git/rr-cache/$sha1 && grep "^=======\$" $rr/preimage && ! test -f $rr/postimage && @@ -91,7 +91,7 @@ test_expect_success 'rerere.enabled works, too' ' git reset --hard && test_must_fail git merge first && - sha1=$(perl -pe "s/ .*//" .git/MERGE_RR) && + sha1=$($PERL_PATH -pe "s/ .*//" .git/MERGE_RR) && rr=.git/rr-cache/$sha1 && grep ^=======$ $rr/preimage ' @@ -101,7 +101,7 @@ test_expect_success 'set up rr-cache' ' git config rerere.enabled true && git reset --hard && test_must_fail git merge first && - sha1=$(perl -pe "s/ .*//" .git/MERGE_RR) && + sha1=$($PERL_PATH -pe "s/ .*//" .git/MERGE_RR) && rr=.git/rr-cache/$sha1 ' @@ -185,7 +185,7 @@ test_expect_success 'rerere updates postimage timestamp' ' test_expect_success 'rerere clear' ' rm $rr/postimage && - echo "$sha1 a1" | perl -pe "y/\012/\000/" >.git/MERGE_RR && + echo "$sha1 a1" | $PERL_PATH -pe "y/\012/\000/" >.git/MERGE_RR && git rerere clear && ! test -d $rr ' |