From a3428205e6d74542d6441baaa29d1cb1d1064d95 Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Mon, 11 Jun 2012 19:01:53 +0000 Subject: 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 Signed-off-by: Junio C Hamano --- t/t4030-diff-textconv.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/t4030-diff-textconv.sh') diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh index d4ab4f2ccf..82e36ec942 100755 --- a/t/t4030-diff-textconv.sh +++ b/t/t4030-diff-textconv.sh @@ -21,7 +21,7 @@ EOF cat >hexdump <<'EOF' #!/bin/sh -perl -e '$/ = undef; $_ = <>; s/./ord($&)/ge; print $_' < "$1" +$PERL_PATH -e '$/ = undef; $_ = <>; s/./ord($&)/ge; print $_' < "$1" EOF chmod +x hexdump -- cgit v1.2.3 From 7096b6486e40f509ee53448596b3cdb86360ad3e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 12 Jun 2012 09:49:59 -0700 Subject: tests: enclose $PERL_PATH in double quotes Otherwise it will be split at a space after "Program" when it is set to "\\Program Files\perl" or something silly like that. Signed-off-by: Junio C Hamano --- t/t4030-diff-textconv.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/t4030-diff-textconv.sh') diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh index 82e36ec942..eebb1eed8b 100755 --- a/t/t4030-diff-textconv.sh +++ b/t/t4030-diff-textconv.sh @@ -21,7 +21,7 @@ EOF cat >hexdump <<'EOF' #!/bin/sh -$PERL_PATH -e '$/ = undef; $_ = <>; s/./ord($&)/ge; print $_' < "$1" +"$PERL_PATH" -e '$/ = undef; $_ = <>; s/./ord($&)/ge; print $_' < "$1" EOF chmod +x hexdump -- cgit v1.2.3