summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-06-25 04:42:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-06-25 04:56:13 (GMT)
commit770bf6c5e2830add4b59d3dbf9929e62ed4d6fb7 (patch)
treee09ef5a919244ec0c5f388655aaee33ed67a4184
parenta3428205e6d74542d6441baaa29d1cb1d1064d95 (diff)
downloadgit-770bf6c5e2830add4b59d3dbf9929e62ed4d6fb7.zip
git-770bf6c5e2830add4b59d3dbf9929e62ed4d6fb7.tar.gz
git-770bf6c5e2830add4b59d3dbf9929e62ed4d6fb7.tar.bz2
t/test-lib.sh: export PERL_PATH for use in scripts
Most notably, t4031 creates a small shell script that invokes perl and we want to use "$PERL_PATH" to name the version of Perl suitable for our use, read from GIT-BUILD-OPTS. The test would fail when it is directly run in t/ directory from the shell or "make" is run in t/ directory. This problem was hidden from "make test" run in the top-level directory, because its Makefile exports PERL_PATH. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--t/test-lib.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 9e2b711..acda33d 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"