diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-09 09:01:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-09 09:01:52 -0700 |
| commit | 967abba7169ad10eff841fe32b70f3e7a1126b63 (patch) | |
| tree | 55a4ad3740e322b4dc47adb5c73d0888c07e74bc /t/test-lib.sh | |
| parent | ee02c2ab379dd25451199938788212414bcdf156 (diff) | |
| parent | ad78585eeebd8d5ac596ad4f06f549734ce9d870 (diff) | |
| download | git-967abba7169ad10eff841fe32b70f3e7a1126b63.tar.gz git-967abba7169ad10eff841fe32b70f3e7a1126b63.tar.xz | |
Merge branch 'vr/use-our-perl-in-tests'
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/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 9e2b71132..acda33d17 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -494,6 +494,8 @@ export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_CONFIG_NOSYSTEM GIT_ATTR_NOSYSTEM . "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS +export PERL_PATH + if test -z "$GIT_TEST_CMP" then if test -n "$GIT_TEST_CMP_USE_COPIED_CONTEXT" |